summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-03-18 10:07:09 -0700
committerZac Medico <zmedico@gentoo.org>2012-03-18 10:07:09 -0700
commitf1fb411525e7429e4f361ad3d352a9154c0e44b6 (patch)
treee532e709068dd941f0604f2dbe3670a711ac8800
parentetc-update: quote ${file} (diff)
downloadportage-f1fb411525e7429e4f361ad3d352a9154c0e44b6.tar.gz
portage-f1fb411525e7429e4f361ad3d352a9154c0e44b6.tar.bz2
portage-f1fb411525e7429e4f361ad3d352a9154c0e44b6.zip
dispatch_conf: fix broken diffstatusoutput_lenv2.2.0_alpha92
-rw-r--r--pym/portage/dispatch_conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 6e8de0f43..3d53f6405 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -138,7 +138,7 @@ def file_archive(archive, curconf, newconf, mrgconf):
# Archive the current config file if it isn't already saved
if os.path.exists(archive) \
- and diffstatusoutput_len("diff -aq '%s' '%s'" % (curconf,archive))[1] != 0:
+ and len(diffstatusoutput("diff -aq '%s' '%s'", curconf, archive)[1]) != 0:
suf = 1
while suf < 9 and os.path.exists(archive + '.' + str(suf)):
suf += 1