summaryrefslogtreecommitdiff
diff options
authorRobert C Jennings <robert.jennings@canonical.com>2017-05-31 16:13:19 -0500
committerRobert C Jennings <robert.jennings@canonical.com>2017-05-31 16:13:19 -0500
commitfc9417e6ef8bdb50427a2a6c3f77aa14477d627d (patch)
treee8313c7209cbf85567abb52ed72f411048b89c53
parent642f2e1bc68b632e818bf4828e8a306667db92f5 (diff)
Consistent sorted output
bzr-revno: 18.2.4
-rwxr-xr-xmfdiff10
1 files changed, 5 insertions, 5 deletions
diff --git a/mfdiff b/mfdiff
index 06b1863..299a348 100755
--- a/mfdiff
+++ b/mfdiff
@@ -249,17 +249,17 @@ def main():
# find new packages in mf2
new = {}
- for pkg in viewkeys(h_to) - viewkeys(h_from):
+ for pkg in sorted(viewkeys(h_to) - viewkeys(h_from)):
new[pkg] = h_to[pkg]
# find packages removed from mf1
removed = {}
- for pkg in viewkeys(h_from) - viewkeys(h_to):
+ for pkg in sorted(viewkeys(h_from) - viewkeys(h_to)):
removed[pkg] = h_from[pkg]
# find modified packages
changed = []
- for pkg in viewkeys(h_from) & viewkeys(h_to):
+ for pkg in sorted(viewkeys(h_from) & viewkeys(h_to)):
if h_from[pkg] != h_to[pkg]:
changed.append(pkg)
@@ -346,12 +346,12 @@ def main():
except UnknownSourceVersionError as e:
errors.append(e)
- for src in bin2src:
+ for src in sorted(bin2src):
binlist = bin2src[src]
binary = binlist[0]
print("==== %s: %s => %s ====" %
(src, h_from[binary], h_to[binary]))
- print("==== %s" % ' '.join(binlist))
+ print("==== %s" % ' '.join(sorted(binlist)))
print_blocks(srcs[src]["changeblocks"])
if errors: