[Reportbug-commits] r649 - in trunk/bin (querybts reportbug)

[morph-guest at users.alioth.debian.org]

    Date: Saturday, September 6, 2008 @ 14:32:08
  Author: morph-guest
Revision: 649

fix version number in programs and config file generation

Modified:
  trunk/bin/querybts
  trunk/bin/reportbug

Modified: trunk/bin/querybts
===================================================================
--- trunk/bin/querybts	2008-09-06 13:43:57 UTC (rev 648)
+++ trunk/bin/querybts	2008-09-06 14:32:08 UTC (rev 649)
@@ -46,8 +46,10 @@
     import reportbug.ui.text_ui as ui
     ui_mode = 'text'
 
-VERSION = "querybts ##VERSION##"
+from reportbug import VERSION_NUMBER
 
+VERSION = "querybts %s" % VERSION_NUMBER
+
 USAGE = ("querybts - Examine the state of a debbugs server.\n\n"
          "Usage: querybts [options] {<package> | <report number> [report2] ...}\n"
          "Supported options (see man page for long forms):\n"

Modified: trunk/bin/reportbug
===================================================================
--- trunk/bin/reportbug	2008-09-06 13:43:57 UTC (rev 648)
+++ trunk/bin/reportbug	2008-09-06 14:32:08 UTC (rev 649)
@@ -24,7 +24,6 @@
 # Version ##VERSION##; see changelog for revision history
 # $Id: reportbug,v 1.98.2.33 2008-04-18 05:38:27 lawrencc Exp $
 
-DEBUGGER = 'lawrencc at debian.org'
 DEFAULT_BTS = 'debian'
 
 import sys
@@ -40,6 +39,7 @@
 from reportbug import utils
 from reportbug import (
     VERSION,
+    VERSION_NUMBER,
     COPYRIGHT
     )
 from reportbug.utils import (
@@ -524,7 +524,7 @@
     print >> fp, '# reportbug preferences file'
     print >> fp, '# character encoding: %s' % charset
     print >> fp, '# Version of reportbug this preferences file was written by'
-    print >> fp, 'reportbug_version "##VERSION##"'
+    print >> fp, 'reportbug_version "%s"' % VERSION_NUMBER
     print >> fp, '# default operating mode: one of:',
     print >> fp, ', '.join(utils.MODELIST)
     print >> fp, 'mode %s' % mode