1 |
Author: zmedico |
2 |
Date: 2008-10-14 22:14:05 +0000 (Tue, 14 Oct 2008) |
3 |
New Revision: 11692 |
4 |
|
5 |
Modified: |
6 |
main/trunk/bin/repoman |
7 |
Log: |
8 |
Bug #229033 - When a Manifest is added automatically by repoman, it's in the |
9 |
"mynew" list, so move manifest paths from that list to the "mymanifests" list |
10 |
when necessary. |
11 |
|
12 |
|
13 |
Modified: main/trunk/bin/repoman |
14 |
=================================================================== |
15 |
--- main/trunk/bin/repoman 2008-10-14 21:37:53 UTC (rev 11691) |
16 |
+++ main/trunk/bin/repoman 2008-10-14 22:14:05 UTC (rev 11692) |
17 |
@@ -1738,8 +1738,23 @@ |
18 |
|
19 |
# Manifests need to be regenerated after all other commits, so don't commit |
20 |
# them now even if they have changed. |
21 |
- mymanifests = [f for f in mychanged if "Manifest" == os.path.basename(f)] |
22 |
- mychanged = [f for f in mychanged if "Manifest" != os.path.basename(f)] |
23 |
+ mymanifests = set() |
24 |
+ changed_set = set() |
25 |
+ new_set = set() |
26 |
+ for f in mychanged: |
27 |
+ if "Manifest" == os.path.basename(f): |
28 |
+ mymanifests.add(f) |
29 |
+ else: |
30 |
+ changed_set.add(f) |
31 |
+ for f in mynew: |
32 |
+ if "Manifest" == os.path.basename(f): |
33 |
+ mymanifests.add(f) |
34 |
+ else: |
35 |
+ new_set.add(f) |
36 |
+ mychanged = list(changed_set) |
37 |
+ mynew = list(new_set) |
38 |
+ mymanifests = list(mymanifests) |
39 |
+ del changed_set, new_set |
40 |
myupdates = mychanged + mynew |
41 |
myheaders = [] |
42 |
mydirty = [] |