Merge lp:~blueyed/apport/bug532944-lucid into lp:~ubuntu-core-dev/ubuntu/lucid/apport/ubuntu

[Daniel Hahler]

[Martin Pitt (pitti)]

Nice catch, thanks! Applied to trunk (r1717), thus I didn't merge your branch directly (it doesn't apply to trunk).

review: Approve

=== modified file 'apport/ui.py'
--- apport/ui.py	2010-02-22 20:54:14 +0000
+++ apport/ui.py	2010-03-05 23:32:21 +0000
@@ -604,7 +604,9 @@
 
         # no argument: default to "show pending crashes" except when called in
         # bug mode
-        if len(self.args) == 0 and cmd.endswith('-bug'):
+        # NOTE: uses sys.argv, since self.args if empty for all the options,
+        # e.g. "-v" or "-u $BUG"
+        if len(sys.argv) == 1 and cmd.endswith('-bug'):
             self.options.filebug = True
             return
 
@@ -1624,6 +1626,19 @@
             self.assertEqual(self.ui.run_argv(), False)
             self.assertEqual(self.ui.msg_severity, 'error')
 
+        def test_run_version(self):
+            '''run_report_bug() as "ubuntu-bug" with version argument.
+            (LP: #532944)'''
+
+            sys.argv = ['ubuntu-bug', '-v']
+            self.ui = _TestSuiteUserInterface()
+            orig_stdout = sys.stdout
+            sys.stdout = StringIO()
+            self.assertEqual(self.ui.run_argv(), True)
+            output = sys.stdout.getvalue()
+            sys.stdout = orig_stdout
+            self.assertEqual(output, __version__+"\n")
+
         def test_run_report_bug_package(self):
             '''run_report_bug() for a package.'''
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-03-05 21:52:39 +0000
+++ debian/changelog	2010-03-05 23:32:21 +0000
@@ -1,3 +1,11 @@
+apport (1.12.1-0ubuntu6) UNRELEASED; urgency=low
+
+  * apport/ui.py: use sys.argv instead of parsed self.args when
+    defaulting to self.options.filebug.
+    This makes "ubuntu-bug -v" and others work as expected. (LP: #532944)
+
+ -- Daniel Hahler <[e-mail]>  Sat, 06 Mar 2010 00:21:37 +0100
+
 apport (1.12.1-0ubuntu5) lucid; urgency=low
 
   * launchpad.py: Do not escalate a bug if its already been escalated and