projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2d957d
)
dispatch_conf: fix broken diffstatusoutput_len
v2.2.0_alpha92
author
Zac Medico
<zmedico@gentoo.org>
Sun, 18 Mar 2012 17:07:09 +0000
(10:07 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 18 Mar 2012 17:07:09 +0000
(10:07 -0700)
pym/portage/dispatch_conf.py
patch
|
blob
|
history
diff --git
a/pym/portage/dispatch_conf.py
b/pym/portage/dispatch_conf.py
index 6e8de0f43e0f9581b79053c1646cfa7f0720b4e1..3d53f6405a4976d89bc6bae56058cf1c89ec03f4 100644
(file)
--- 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