From 0df8ac09ad242287d3a18ac414207fa27f4a9583 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 11 Apr 2011 12:04:19 +0100 Subject: [PATCH] When uploading docs, use rsync -p to set permissions It turns out that rsync --chmod means "pretend the source files had already had this chmod operation applied to them", and not "chmod the destination files" like you'd expect. As a result, the -p (--perms) option is also needed, so that rsync will "preserve" the modified permissions. Otherwise, the docs will not be group-writeable as intended, and only the person who made the previous upload will be able to upload them next time. --- doc/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index e8156c6..11f756d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -135,7 +135,7 @@ SPECIFICATION_PATH = /srv/specifications.freedesktop.org/www/dbus/1.0 maintainer-upload-docs: dbus-docs.tar.gz dbus-docs scp dbus-docs.tar.gz $(DOC_SERVER):$(DOC_WWW_DIR) - rsync -rvzP --chmod=Dg+s,ug+rwX,o=rX \ + rsync -rpvzP --chmod=Dg+s,ug+rwX,o=rX \ dbus-docs/ $(DOC_SERVER):$(DOC_WWW_DIR)/doc/ scp -p $(DTDS) $(SPECIFICATION_SERVER):$(SPECIFICATION_PATH) else -- 1.7.4.1