From: Zac Medico Date: Tue, 23 Jul 2013 19:25:37 +0000 (-0700) Subject: PORTAGE_RSYNC_OPTS: --omit-dir-times X-Git-Tag: v2.2.0_alpha189~24 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=367bbdfdab866c00c0d826732d4672ed3863fa09;p=portage.git PORTAGE_RSYNC_OPTS: --omit-dir-times Directory modification times are irrelevant, and preserving them can be annoying when using squashfs + unionfs, since it can trigger creation many empty directories in the RW branch. --- diff --git a/cnf/make.globals b/cnf/make.globals index 3c3ddc56e..e291b8286 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -92,7 +92,7 @@ PORTAGE_RSYNC_RETRIES="-1" # Number of seconds rsync will wait before timing out. #RSYNC_TIMEOUT="180" -PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" +PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" # The number of days after the last `emerge --sync` that a warning # message should be produced. diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 0fecc8fc3..8c314b376 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2169,6 +2169,7 @@ def _sync_repo(emerge_config, repo): "--safe-links", # Ignore links outside of tree "--perms", # Preserve permissions "--times", # Preserive mod times + "--omit-dir-times", "--compress", # Compress the data transmitted "--force", # Force deletion on non-empty dirs "--whole-file", # Don't do block transfers, only entire files