Germinate

Merge ~paride/germinate:fix-duplicate-handling into germinate:master

  1. Git
  2. lp:~paride/germinate
  3. fix-duplicate-handling
  4. Merge into master
Proposed by Paride Legovini
Status: Merged
Merged at revision: 9c2d1333c0f0d5d54cfba4dde08e62597db314ad
Proposed branch: ~paride/germinate:fix-duplicate-handling
Merge into: germinate:master
Diff against target: 53 lines (+6/-8)
1 file modified
germinate/scripts/germinate_update_metapackage.py (+6/-8)
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+394593@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/germinate/scripts/germinate_update_metapackage.py b/germinate/scripts/germinate_update_metapackage.py
2index 5dcc5c6..103a775 100644
3--- a/germinate/scripts/germinate_update_metapackage.py
4+++ b/germinate/scripts/germinate_update_metapackage.py
5@@ -296,7 +296,7 @@ def main(argv):
6 os.rename(output_filename, output_filename + '.old')
7
8 # work on the depends
9- new_list = []
10+ new_list = set()
11 packages = seed_packages(germinator.get_seed_entries,
12 structure, seed_name)
13 for package in packages:
14@@ -311,17 +311,16 @@ def main(argv):
15 print("%s/%s: Skipping package %s (essential)" %
16 (seed_name, architecture, package))
17 else:
18- new_list.append(package)
19+ new_list.add(package)
20
21- new_list.sort()
22 with open(output_filename, 'w') as output:
23- for package in new_list:
24+ for package in sorted(new_list):
25 output.write(package)
26 output.write('\n')
27
28 # work on the recommends
29 old_recommends_list = None
30- new_recommends_list = []
31+ new_recommends_list = set()
32 packages = seed_packages(germinator.get_seed_recommends_entries,
33 structure, seed_name)
34 for package in packages:
35@@ -333,9 +332,8 @@ def main(argv):
36 print("%s/%s: Skipping package %s (package not in "
37 "debootstrap)" % (seed_name, architecture, package))
38 else:
39- new_recommends_list.append(package)
40+ new_recommends_list.add(package)
41
42- new_recommends_list.sort()
43 seed_name_recommends = '%s-recommends' % seed_name
44 output_recommends_filename = os.path.join(
45 options.outdir, '%s-%s' % (seed_name_recommends, architecture))
46@@ -348,7 +346,7 @@ def main(argv):
47 output_recommends_filename + '.old')
48
49 with open(output_recommends_filename, 'w') as output:
50- for package in new_recommends_list:
51+ for package in sorted(new_recommends_list):
52 output.write(package)
53 output.write('\n')
54

Subscribers

People subscribed via source and target branches

to all changes: