[Reportbug-commits] r562 - in trunk (debian/changelog reportbuglib/reportbug.py)

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

    Date: Sunday, July 6, 2008 @ 23:09:08
  Author: morph-guest
Revision: 562

no system info for wnpp bugs; Closes: #448806

Modified:
  trunk/debian/changelog
  trunk/reportbuglib/reportbug.py

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-06 15:55:25 UTC (rev 561)
+++ trunk/debian/changelog	2008-07-06 23:09:08 UTC (rev 562)
@@ -12,8 +12,11 @@
   * reportbug
     - fixed packages list generation for a file search if run not in a tty (or
       via --template); thanks to Dan Jacobson for the report; Closes: #489515
+  * reportbuglib/reportbug.py
+    - show system information only if the bug is not against wnpp; thanks to
+      Francois Marier for the report; Closes: #448806
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Sun, 06 Jul 2008 17:56:38 +0200
+ -- Sandro Tosi <matrixhasu at gmail.com>  Mon, 07 Jul 2008 01:06:46 +0200
 
 reportbug (3.42) unstable; urgency=low
 

Modified: trunk/reportbuglib/reportbug.py
===================================================================
--- trunk/reportbuglib/reportbug.py	2008-07-06 15:55:25 UTC (rev 561)
+++ trunk/reportbuglib/reportbug.py	2008-07-06 23:09:08 UTC (rev 562)
@@ -794,40 +794,43 @@
                 debinfo += u'Architecture: %s (%s)\n' % (debarch, utsmachine)
         else:
             debinfo += u'Architecture: ? (%s)\n' % utsmachine
+
+
+    # Gather system info only for bugs not wnpp
+    if package not in ('wnpp'):
         debinfo += u'\n'
 
-    if un[0] == 'GNU':
-        # Use uname -v on Hurd
-        uname_string = un[3]
-    else:
-        kern = un[0]
-        if kern.startswith('GNU/'):
-            kern = kern[4:]
+        if un[0] == 'GNU':
+            # Use uname -v on Hurd
+            uname_string = un[3]
+        else:
+            kern = un[0]
+            if kern.startswith('GNU/'):
+                kern = kern[4:]
 
-        uname_string = '%s %s' % (kern, un[2])
-        if kern == 'Linux':
-            kinfo = []
+            uname_string = '%s %s' % (kern, un[2])
+            if kern == 'Linux':
+                kinfo = []
 
-            if 'SMP' in un[3]:
-                cores = get_cpu_cores()
-                if cores > 1:
-                    kinfo += ['SMP w/%d CPU cores' % cores]
-                else:
-                    kinfo += ['SMP w/1 CPU core']
-            if 'PREEMPT' in un[3]:
-                kinfo += ['PREEMPT']
+                if 'SMP' in un[3]:
+                    cores = get_cpu_cores()
+                    if cores > 1:
+                        kinfo += ['SMP w/%d CPU cores' % cores]
+                    else:
+                        kinfo += ['SMP w/1 CPU core']
+                if 'PREEMPT' in un[3]:
+                    kinfo += ['PREEMPT']
 
-            if kinfo:
-                uname_string = '%s (%s)' % (uname_string, '; '.join(kinfo))
+                if kinfo:
+                    uname_string = '%s (%s)' % (uname_string, '; '.join(kinfo))
 
-    if uname_string:
-        debinfo += u'Kernel: %s\n' % uname_string
+        if uname_string:
+            debinfo += u'Kernel: %s\n' % uname_string
+        if locinfo:
+            debinfo += u'Locale: %s\n' % locinfo
+        if shellpath != '/bin/sh':
+            debinfo += u'Shell: /bin/sh linked to %s\n' % shellpath
 
-    if locinfo:
-        debinfo += u'Locale: %s\n' % locinfo
-    if shellpath != '/bin/sh':
-        debinfo += u'Shell: /bin/sh linked to %s\n' % shellpath
-
     return u"""%s%s%s
 -- System Information:
 %s%s%s""" % (report, body, incfiles, debinfo, depinfo, confinfo)