[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.6-17-gcdad7ce

[Sandro Tosi]

The following commit has been merged in the master branch:
commit fd9bfa406209a454ea29428e3eaf06ed6f70d7a6
Merge: 4560ce88003f8c333483ee810ad44eb5b3a20414 3ae9e9c6aed2fb01dc3eee6554c3bfe029c3389f
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Sep 2 23:05:45 2009 +0200

    merge release.debian.org

diff --combined bin/reportbug
index 79d614f,265b5fd..b0dd4fb
--- a/bin/reportbug
+++ b/bin/reportbug
@@@ -448,11 -448,11 +448,11 @@@ def get_package_name(bts='debian', mode
                  False):
                  return get_package_name(bts, mode)
  
-         if package == 'ftp.debian.org':
+         if package in ('ftp.debian.org', 'release.debian.org'):
              if not ui.yes_no(
-                 'Are you sure you want to file a bug on ftp.debian.org?',
+                 'Are you sure you want to file a bug on %s?' % (package),
                  'Yes, I am a developer or know what I\'m doing.',
-                 'No, I am not a developer and I don\'t know what ftp.debian.org is.',
+                 'No, I am not a developer and I don\'t know what %s is.' % (package),
                  False):
                  return get_package_name(bts, mode)
  
@@@ -928,21 -928,15 +928,21 @@@ def main()
  
          try:
              lib_package = __import__('reportbug.ui', fromlist=[iface])
 -            ui = getattr(lib_package, iface)
 +            newui = getattr(lib_package, iface)
          except UINotImportable, msg:
              ui.long_message('*** Unable to import %s interface: %s '
                              'Falling back to text interface.\n',
                              interface, msg)
              ewrite('\n')
  
 -        ui.initialize ()
 -        submit.ui = ui
 +        if newui.initialize ():
 +            ui = newui
 +            submit.ui = ui
 +        else:
 +            ui.long_message('*** Unable to initialize %s interface. '
 +                            'Falling back to text interface.\n',
 +                            interface)
 +
          # Add INTERFACE as an environment variable to access it from the
          # script gathering the special information for reportbug, when
          # a new bug should be filed against it.
@@@ -1772,7 -1766,8 +1772,8 @@@ For more details, please see: http://ww
          HOMEDIR = os.environ.get('HOME', '/')
  
          if (rtype == 'debbugs' and not self.options.tags and
-             not (notatty or self.options.kudos or exinfo) and package not in ('wnpp','ftp.debian.org') and
+             not (notatty or self.options.kudos or exinfo) and
+             package not in ('wnpp', 'ftp.debian.org', 'release.debian.org') and
              mode > MODE_NOVICE):
              # Multiple-choice checkbox
              if severity in ('grave', 'critical', 'serious'):
diff --combined debian/changelog
index 5347071,d895047..70af996
--- a/debian/changelog
+++ b/debian/changelog
@@@ -18,16 -18,10 +18,19 @@@ reportbug (4.7) UNRELEASED; urgency=lo
         LDAP support is gone since years; thanks to martin f krafft for the
         report; Closes: #271057
  
 +  [ Luca Bruno ]
 +  * reportbug/ui/gtk_ui.py
 +    - wrap words when editing bug reports
 +    - workaround possible GTK+ regression to show the intro page
 +    - fix to menu to always display all menu options
 +  * bin/reportbug, reportbug/ui/*.py
 +    - fallback to text interface if a different UI can't be initialized; thanks
 +      to Colin S. Miller for the report; Closes: #534876
 +
+   [ Pierre Habouzit ]
+   * Add support for the release.debian.org pseudo-package.
+ 
 - -- Sandro Tosi <morph at debian.org>  Tue, 18 Aug 2009 09:39:44 +0200
 + -- Sandro Tosi <morph at debian.org>  Wed, 02 Sep 2009 22:58:49 +0200
  
  reportbug (4.6) unstable; urgency=low
  

-- 
Reportbug - reports bugs in the Debian distribution