UBUNTU: [Packaging] git-ubuntu-log -- fix order of tracking bug commit

[mirror_ubuntu-bionic-kernel.git] / debian / scripts / misc / git-ubuntu-log

diff --git a/debian/scripts/misc/git-ubuntu-log b/debian/scripts/misc/git-ubuntu-log
index 490ecce73c484e098c2b3bf7ea8875ab28f09e9f..4bf738f8fed1ac3bfdad076637190634bb7b4ddf 100755 (executable)
--- a/debian/scripts/misc/git-ubuntu-log
+++ b/debian/scripts/misc/git-ubuntu-log
@@ -28,13 +28,19 @@ def add_entry(entry):
             else:
                 combo = '__mainline__'
         else:
-            if combo not in keys:
-                keys.append(combo)
+            if entry.get('subject', "") == 'UBUNTU: link-to-tracker: update tracking bug':
+                # Construct a key with '__trackingbug__' on the first position
+                # and the tracking bug number afterwards
+                combo.insert(0, '__trackingbug__')
+                # Tracking bug goes at the top
+                keys.insert(0, combo)
+            else:
+                if combo not in keys:
+                    keys.append(combo)
 
         entry['key'] = combo
         entries.append(entry)
 
-
 # Suck up the git log output and extract the information we need.
 keys = []
 entry = None
@@ -90,6 +96,10 @@ for key in keys:
         for bug in key:
             if bug.startswith('CVE-'):
                 title_set.append(bug)
+            elif bug == '__trackingbug__':
+                # Look for the tracking bug number on the second
+                # position of the key
+                continue
             else:
                 bug_info = None
 
@@ -132,8 +142,9 @@ for key in keys:
 
             emit_title = False
 
-        title_lines = textwrap.wrap(entry['subject'], 76)
-        print('    - ' + title_lines[0])
-        for line in title_lines[1:]:
-            line = line.replace('LP###', 'LP: #')
-            print('      ' + line)
+        if key[0] != '__trackingbug__':
+            title_lines = textwrap.wrap(entry['subject'], 76)
+            print('    - ' + title_lines[0])
+            for line in title_lines[1:]:
+                line = line.replace('LP###', 'LP: #')
+                print('      ' + line)