summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-26 06:51:17 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-26 06:51:17 +0000
commitde124b51145df5d28280ec4056019ebc079afeb8 (patch)
treee1e7ee3d6a76772e8cb01c18fe073a466c1d9332
parent99efc10534e7e44609b115fa02eb2a2af3f0f848 (diff)
downloadportage-de124b51145df5d28280ec4056019ebc079afeb8.tar.gz
portage-de124b51145df5d28280ec4056019ebc079afeb8.tar.bz2
portage-de124b51145df5d28280ec4056019ebc079afeb8.zip
Eliminate redundant Manifest separation code by combining mychanged + mynew sooner.
svn path=/main/trunk/; revision=12098
-rwxr-xr-xbin/repoman17
1 files changed, 4 insertions, 13 deletions
diff --git a/bin/repoman b/bin/repoman
index bf0654516..ae4109b70 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1758,23 +1758,14 @@ else:
# Manifests need to be regenerated after all other commits, so don't commit
# them now even if they have changed.
mymanifests = set()
- changed_set = set()
- new_set = set()
- for f in mychanged:
+ myupdates = set()
+ for f in mychanged + mynew:
if "Manifest" == os.path.basename(f):
mymanifests.add(f)
else:
- changed_set.add(f)
- for f in mynew:
- if "Manifest" == os.path.basename(f):
- mymanifests.add(f)
- else:
- new_set.add(f)
- mychanged = list(changed_set)
- mynew = list(new_set)
+ myupdates.add(f)
+ myupdates = list(myupdates)
mymanifests = list(mymanifests)
- del changed_set, new_set
- myupdates = mychanged + mynew
myheaders = []
mydirty = []
headerstring = "'\$(Header|Id)"