Merge lp:~blueyed/apport/bug532944 into lp:~apport-hackers/apport/trunk

[Daniel Hahler]

[Martin Pitt (pitti)]

This was merged a long time ago already.

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-03-05 15:48:31 +0000
+++ NEWS	2010-03-05 23:27:20 +0000
@@ -11,6 +11,7 @@
 Bug fixes:
  - Fix --help output for bug updating mode (invocation as apport-collect or
    apport-update-bug). (LP: #504116)
+ - Fix argument/options handling for "ubuntu-bug" (LP: #532944)
 
 1.12.1 (2010-02-22)
 -------------------

=== modified file 'apport/ui.py'
--- apport/ui.py	2010-03-05 15:48:31 +0000
+++ apport/ui.py	2010-03-05 23:27:20 +0000
@@ -619,7 +619,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
 
@@ -1639,6 +1641,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.'''