From: Simon McVittie Date: Mon, 11 Apr 2011 11:04:19 +0000 (+0100) Subject: When uploading docs, use rsync -p to set permissions X-Git-Tag: dbus-1.5.2~28^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59c6663293bbbd9399f4c16611e06bbe799ddb8a;p=thirdparty%2Fdbus.git 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. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36130 Reviewed-by: Will Thompson --- diff --git a/doc/Makefile.am b/doc/Makefile.am index e8156c6bf..11f756de1 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