[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-19-gb17733a

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 396a8e77c380600b90331b53a5a3ff3b0f809904
Author: chaica <chaica at ohmytux.com>
Date:   Wed Jul 29 00:25:53 2009 +0200

    warn users for options not available v2

diff --git a/bin/querybts b/bin/querybts
index 3a70938..3c87cfb 100755
--- a/bin/querybts
+++ b/bin/querybts
@@ -194,13 +194,31 @@ def main():
             match = reportre.match(package)
             if match:
                 report = int(match.group(1))
-                return ui.show_report(report, options.system, options.mirrors,
-                                      options.http_proxy, queryonly=True,
-                                      title=VERSION,
-                                      archived=options.archived)
-        ui.handle_bts_query(package, options.system, options.mirrors, options.http_proxy,
-                            queryonly=True, title=VERSION, archived=options.archived,
-                            source=options.source, buglist=options.buglist)
+                while 1 :
+                    retvalue = ui.show_report(report, options.system, options.mirrors,
+                                          options.http_proxy, queryonly=True,
+                                          title=VERSION,
+                                          archived=options.archived)
+                    ui.long_message('This option is not available while using querybts alone.\n')
+                    x = ui.select_options('What do you want to do now?', 'Qb',
+                                          {'q': 'Exit querybts.',
+                                           'b': 'Query BTS one more time.'})
+                    if x == 'q':
+                        ui.long_message('Exiting.\n')
+                        sys.exit(0)
+
+        while 1:
+            ui.handle_bts_query(package, options.system, options.mirrors, options.http_proxy,
+                                queryonly=True, title=VERSION, archived=options.archived,
+                                source=options.source, buglist=options.buglist)
+            ui.long_message('This option is not available while using querybts alone.\n')
+            x = ui.select_options('What do you want to do now?', 'Qb',
+                                  {'q': 'Exit querybts.',
+                                   'b': 'Query BTS one more time.'})
+            if x == 'q':
+                ui.long_message('Exiting.\n')
+                sys.exit(0)
+
     except NoPackage:
         ui.long_message('Package appears not to exist in the BTS.\n')
     except NoBugs:

-- 
Reportbug - reports bugs in the Debian distribution