here's my trivial patch, against current git, to fix the two debsums
related bug reports.

The output probably says the package name and "debsums" a few too many
times :). but still, I think it's more clear than it was before.

Here's example output:

Verifying package integrity...
There may be a problem with your installation of reportbug;
debsums found the following problems with files installed from reportbug:
debsums: changed file /usr/bin/reportbug (from reportbug package)
Do you still want to file a report [y|N|q|?]? 

Cheers,
Ryan

-- 
_________________________
Ryan Niebur
[email protected]
diff --git a/bin/reportbug b/bin/reportbug
index b0dd4fb..876e325 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1367,14 +1367,14 @@ class UI(object):
         if (pkgavail and self.options.verify and os.path.exists('/usr/bin/debsums')
             and not self.options.kudos and state == 'installed'):
             ewrite('Verifying package integrity...\n')
-            rc, output = commands.getstatusoutput('/usr/bin/debsums -s'+
+            rc, output = commands.getstatusoutput('/usr/bin/debsums --ignore-permissions -s'+
                                                   commands.mkarg(package))
             debsumsoutput = output
 
             if rc and not notatty:
                 if not ui.yes_no(
                     'There may be a problem with your installation of '+package+
-                    ';\nthe following files appear to be missing or changed:\n'+
+                    ';\ndebsums found the following problems with files installed from '+package+':\n'+
                     output+'\nDo you still want to file a report',
                     'Ignore this problem and continue.  This may be '
                     'appropriate if you have fixed the package manually already.  '
diff --git a/debian/changelog b/debian/changelog
index 5a83f5c..7419d9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,13 @@ reportbug (4.8) UNRELEASED; urgency=low
   [ Pierre Habouzit ]
   * Fix small issues with the release.debian.org binNMU template.
 
+  [ Ryan Niebur ]
+  * pass --ignore-permissions to debsums so that reportbug can be ran by
+    normal users without getting error messages from debsums (Closes:
+    539695)
+    - conflict with debsums before 2.0.47
+  * improve the text before debsums output (Closes: 322567)
+
  -- Sandro Tosi <[email protected]>  Tue, 08 Sep 2009 22:58:18 +0200
 
 reportbug (4.7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 034b92a..ffdb41d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: reportbug
 Architecture: all
 Depends: ${python:Depends}, apt, python-reportbug (= ${source:Version})
 Suggests: postfix | exim4 | mail-transport-agent, gnupg | pgp, debconf-utils (>> 1.1.0), debsums, file (>> 1.30), dlocate, python-urwid, python-gtk2, python-vte, python-gtkspell, xdg-utils
-Conflicts: python-urwid (<< 0.9.8-1), python-central (<< 0.5.13)
+Conflicts: python-urwid (<< 0.9.8-1), python-central (<< 0.5.13), debsums (<< 2.0.47)
 XB-Python-Version: ${python:Versions}
 Description: reports bugs in the Debian distribution
  reportbug is a tool designed to make the reporting of bugs in Debian

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Reportbug-maint mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/reportbug-maint

Reply via email to