Merge ~paelzer/germinate:improve-reproducibility-by-ordering into germinate:master

Proposed by Christian Ehrhardt 
Status: Merged
Merged at revision: 384384afbb28d1baa02322146b5c02ec8f99a3bc
Proposed branch: ~paelzer/germinate:improve-reproducibility-by-ordering
Merge into: germinate:master
Diff against target: 23 lines (+3/-2)
1 file modified
germinate/germinator.py (+3/-2)
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+396826@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/germinator.py b/germinate/germinator.py
2index 11ad556..01ecd24 100644
3--- a/germinate/germinator.py
4+++ b/germinate/germinator.py
5@@ -1709,7 +1709,7 @@ class Germinator(object):
6
7 # For each source, add any binaries that match the include/exclude
8 # patterns.
9- for src in rescue_srcs:
10+ for src in sorted(rescue_srcs):
11 rescue = [p for p in self._sources[src]["Binaries"]
12 if p in self._packages]
13 included = set()
14@@ -1719,7 +1719,8 @@ class Germinator(object):
15 if rescue_seedname in seed._excludes:
16 for exclude in seed._excludes[rescue_seedname]:
17 included -= set(self._filter_packages(rescue, exclude))
18- for pkg in included:
19+
20+ for pkg in sorted(included):
21 if pkg in output._all:
22 continue
23 for lesserseed in self._strictly_outer_seeds(seed):

Subscribers

People subscribed via source and target branches