[gentoo-commits] proj/portage:master commit in: cnf/, pym/_emerge/

[Zac Medico]

commit:     ecf347fe2bde0f285b04070a13a170accdf73838
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 11:26:13 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 11:26:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ecf347fe

Add --human-readable to rsync opts for bug 269410

---
 cnf/make.globals       |    2 +-
 pym/_emerge/actions.py |    1 +
 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