[next] telepathy-glib: make-version-script: output symbols in sorted order for easier diffing

Simon McVittie smcv at kemper.freedesktop.org
Tue Apr 8 12:11:43 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 2340a38bf01b6d0f43aaad903d0b7b7cc69ac45c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=2340a38bf01b6d0f43aaad903d0b7b7cc69ac45c

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Apr  4 16:25:39 2014 +0100

make-version-script: output symbols in sorted order for easier diffing

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77139
Reviewed-by: Xavier Claessens

---

 tools/make-version-script.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/make-version-script.py b/tools/make-version-script.py
index 1fe6b90..47042d0 100644
--- a/tools/make-version-script.py
+++ b/tools/make-version-script.py
@@ -199,7 +199,7 @@ def main(abifiles, symbols=None, unreleased_version=None,
         if missing:
             e('These symbols have disappeared:')
 
-            for symbol in missing:
+            for symbol in sorted(missing):
                 e('    %s', symbol)
 
             raise SystemExit(1)
@@ -216,12 +216,12 @@ def main(abifiles, symbols=None, unreleased_version=None,
                     print('%s {' % private_version)
                     print('    global:')
 
-                    for symbol in private:
+                    for symbol in sorted(private):
                         print('        %s;' % symbol)
 
                     print('};')
                 elif dpkg:
-                    for symbol in private:
+                    for symbol in sorted(private):
                         print(' %s@%s 0 1' % (symbol, private_version))
 
                 unreleased = set([symbol
@@ -232,7 +232,7 @@ def main(abifiles, symbols=None, unreleased_version=None,
             if unreleased_version is None:
                 e('Unversioned symbols are not allowed in releases:')
 
-                for symbol in unreleased:
+                for symbol in sorted(unreleased):
                     e('    %s', symbol)
 
                 raise SystemExit(1)
@@ -241,7 +241,7 @@ def main(abifiles, symbols=None, unreleased_version=None,
                 print("%s {" % unreleased_version)
                 print("    global:")
 
-                for symbol in unreleased:
+                for symbol in sorted(unreleased):
                     print("        %s;" % symbol)
 
                 print("} %s;" % version)



More information about the telepathy-commits mailing list