From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Mar 2012 17:07:09 +0000 (-0700)
Subject: dispatch_conf: fix broken diffstatusoutput_len
X-Git-Tag: v2.2.0_alpha92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1fb411525e7429e4f361ad3d352a9154c0e44b6;p=portage.git

dispatch_conf: fix broken diffstatusoutput_len
---

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