| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-26 06:52:05 +0000 (Wed, 26 Nov 2008) |
| 3 |
New Revision: 12099 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/repoman |
| 7 |
Log: |
| 8 |
Eliminate redundant Manifest separation code by combining mychanged + mynew sooner. |
| 9 |
(trunk r12098) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/bin/repoman |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/bin/repoman 2008-11-26 06:51:17 UTC (rev 12098) |
| 15 |
+++ main/branches/2.1.6/bin/repoman 2008-11-26 06:52:05 UTC (rev 12099) |
| 16 |
@@ -1758,23 +1758,14 @@ |
| 17 |
# Manifests need to be regenerated after all other commits, so don't commit |
| 18 |
# them now even if they have changed. |
| 19 |
mymanifests = set() |
| 20 |
- changed_set = set() |
| 21 |
- new_set = set() |
| 22 |
- for f in mychanged: |
| 23 |
+ myupdates = set() |
| 24 |
+ for f in mychanged + mynew: |
| 25 |
if "Manifest" == os.path.basename(f): |
| 26 |
mymanifests.add(f) |
| 27 |
else: |
| 28 |
- changed_set.add(f) |
| 29 |
- for f in mynew: |
| 30 |
- if "Manifest" == os.path.basename(f): |
| 31 |
- mymanifests.add(f) |
| 32 |
- else: |
| 33 |
- new_set.add(f) |
| 34 |
- mychanged = list(changed_set) |
| 35 |
- mynew = list(new_set) |
| 36 |
+ myupdates.add(f) |
| 37 |
+ myupdates = list(myupdates) |
| 38 |
mymanifests = list(mymanifests) |
| 39 |
- del changed_set, new_set |
| 40 |
- myupdates = mychanged + mynew |
| 41 |
myheaders = [] |
| 42 |
mydirty = [] |
| 43 |
headerstring = "'\$(Header|Id)" |
Archives