Eliminate redundant Manifest separation code by combining mychanged + mynew sooner.

(trunk r12098)

svn path=/main/branches/2.1.6/; revision=12099

diff --git a/bin/repoman b/bin/repoman
index 028869f5cbaaf245bb8e3e83ccbc6f1e1113c6f9..06c0447edb40472759ffac8ed63abdd85ceb7603 100755 (executable)
--- 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)"