Merge lp:~brian-murray/ubuntu/natty/apport/natty-regression-tags into lp:~ubuntu-core-dev/ubuntu/natty/apport/ubuntu

[Brian Murray]

This modifies the linux package hook to prevent regression-release bugs from being tagged regression-updates - see bug 692344. Additionally, I've reordered the regression tags in likelyhood of greatest usage and tried to clarify that 'regression-release' applies to the dev release and a stable release but not an updated package in the stable release.

[lp:~brian-murray/ubuntu/natty/apport/natty-regression-tags]

1714. By Brian Murray on 2011-01-04

there is no need to test package failures with the upstream kernel

=== modified file 'data/package-hooks/source_linux.py'
--- data/package-hooks/source_linux.py	2010-10-11 22:28:38 +0000
+++ data/package-hooks/source_linux.py	2011-01-04 19:18:13 +0000
@@ -12,7 +12,6 @@
 the full text of the license.
 '''
 
-import os
 import os.path
 import subprocess
 from apport.hookutils import *
@@ -74,15 +73,14 @@
     report['Regression'] = "No"
     if response == True:
         report['Regression'] = "Yes"
-        regression_tags = ["regression-release",
-            "regression-update", "regression-proposed"]
+        regression_tags = ["regression-update",
+            "regression-release", "regression-proposed"]
 
         # add code to check if running dev release; if so, tag regression-potential and move on.
         regression = ui.choice("How would you describe the regression?",
-            ["regression-release - A regression in a new stable release.",
-             "regression-release - A bug discovered in the development release that was not present in the stable release.",
-             "regression-update - A regression introduced by an updated package in the stable release.",
-             "regression-proposed - A regression introduced by a package in -proposed .",
+            ["regression-update - A regression introduced by an updated package in the stable release.",
+             "regression-release - A regression in the development release or a new stable release.",
+             "regression-proposed - A regression introduced by a package in -proposed.",
              "I don't know."], False)
 
         #Don't Know response defaults to regression-release
@@ -112,8 +110,9 @@
                     frequency_options)
         report['Frequency'] = frequency_options[frequency[0]]
 
-    tags.append("needs-upstream-testing")
-    ui.information("Testing the upstream kernel can help isolate issues in Ubuntu kernel patches, discover a bug is fixed upstream, or confirm the issue exists upstream.  It would be great if you could test with the upstream kernel and let us know your results by posting a comment in the bug report.  For information on testing the upstream kernel, refer to https://wiki.ubuntu.com/KernelTeam/MainlineBuilds")
+    if 'apport-package' not in tags:
+        tags.append("needs-upstream-testing")
+        ui.information("Testing the upstream kernel can help isolate issues in Ubuntu kernel patches, discover a bug is fixed upstream, or confirm the issue exists upstream.  It would be great if you could test with the upstream kernel and let us know your results by posting a comment in the bug report.  For information on testing the upstream kernel, refer to https://wiki.ubuntu.com/KernelTeam/MainlineBuilds")
 
     report.setdefault('Tags', '')
     report['Tags'] += ' ' + ' '.join(tags)