aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-01-12 11:26:13 (GMT)
committerZac Medico <zmedico@gentoo.org>2012-01-12 11:26:13 (GMT)
commitecf347fe2bde0f285b04070a13a170accdf73838 (patch)
tree8737350e62a6661f22c93a39300d410e13991363
parentread_corresponding_eapi_file: unicode, bug 398587 (diff)
downloadportage-ecf347fe2bde0f285b04070a13a170accdf73838.zip
portage-ecf347fe2bde0f285b04070a13a170accdf73838.tar.gz
portage-ecf347fe2bde0f285b04070a13a170accdf73838.tar.bz2
Add --human-readable to rsync opts for bug 269410
-rw-r--r--cnf/make.globals2
-rw-r--r--pym/_emerge/actions.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index fade448..0f6f541 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -95,7 +95,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 --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
+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"
# 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 1725053..31d53f9 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2024,6 +2024,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
"--whole-file", # Don't do block transfers, only entire files
"--delete", # Delete files that aren't in the master tree
"--stats", # Show final statistics about what was transfered
+ "--human-readable",
"--timeout="+str(mytimeout), # IO timeout if not done in X seconds
"--exclude=/distfiles", # Exclude distfiles from consideration
"--exclude=/local", # Exclude local from consideration