Merge lp:~brian-murray/ubuntu/quantal/grub2/apport-hook-changes into lp:ubuntu/quantal/grub2

[Brian Murray]

I moved the function for attaching /etc/default/grub from the grub2 apport source package hook to apport's hookutils.py so that it can be used by other packages like friendly-recovery or memtest86+.

The upload of grub should wait for the new version of apport to be uploaded to quantal, I just wanted to get these changes off my system. ;-)

[Colin Watson (cjwatson)]

It's not implausible that grub2 might be upgraded without apport, which would cause the apport hook to crash; that seems undesirable. A Depends would be overkill, but how about having grub-common Breaks: apport (<< 2.1.1-0ubuntu1) so that we don't have to worry about this?

review: Needs Fixing

[lp:~brian-murray/ubuntu/quantal/grub2/apport-hook-changes]

144. By Brian Murray on 2012-05-30

merge with upstream

145. By Brian Murray on 2012-05-30

update grub-common to break on an apport version without attach_default_grub

[Dimitri John Ledkov (xnox)]

Colin's comments were fixed. Looks good, tested against current package and committed into lp:~ubuntu-core-dev/ubuntu/quantal/grub2/quantal so this change should be part of next release. Seems minor to make grub2 release just with this fix. Thanks a lot.

review: Approve

=== modified file 'debian/apport/source_grub2.py'
--- debian/apport/source_grub2.py	2012-05-30 12:11:57 +0000
+++ debian/apport/source_grub2.py	2012-05-30 17:13:20 +0000
@@ -1,3 +1,4 @@
+# vim: set fileencoding=UTF-8 :
 '''apport package hook for grub2
 
 Author: Jean-Baptiste Lallement <[e-mail]>
@@ -49,23 +50,12 @@
         return False
     return True
 
-def _attach_file_filtered(report, path, key=None):
-    '''filter out password from grub configuration'''
-    if not key:
-        key = path_to_key(path)
-
-    if os.path.exists(path):
-        with open(path,'r') as f:
-            filtered = [l if not l.startswith('password')
-                        else '### PASSWORD LINE REMOVED ###'
-                        for l in f.readlines()]
-            report[key] = ''.join(filtered)
 
 def add_info(report):
     if report['ProblemType'] == 'Package':
         # To detect if root fs is a loop device
         attach_file(report, '/proc/cmdline','ProcCmdLine')
-        _attach_file_filtered(report, '/etc/default/grub','EtcDefaultGrub')
+        attach_default_grub(report, 'EtcDefaultGrub')
         attach_file_if_exists(report, '/boot/grub/device.map', 'DeviceMap')
 
         invalid_grub_script = []

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-30 12:11:57 +0000
+++ debian/changelog	2012-05-30 17:13:20 +0000
@@ -65,6 +65,12 @@
 
  -- Colin Watson <[e-mail]>  Wed, 30 May 2012 10:38:40 +0100
 
+grub2 (1.99-21ubuntu5) UNRELEASED; urgency=low
+
+  * source_grub2.py: use attach_default_grub from apport's hookutils
+
+ -- Brian Murray <[e-mail]>  Fri, 25 May 2012 09:33:26 -0700
+
 grub2 (1.99-21ubuntu4) quantal; urgency=low
 
   * Switch to backwards compatible ${} syntax for grub.cfg (LP: #978464)

=== modified file 'debian/control'
--- debian/control	2012-05-15 08:03:30 +0000
+++ debian/control	2012-05-30 17:13:20 +0000
@@ -71,7 +71,7 @@
 Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6)
 # See bugs #435983 and #455746
 Conflicts: mdadm (<< 2.6.7-2)
-Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13)
+Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13), apport (<< 2.1.1-0ubuntu1)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader (common files)
  This package contains common files shared by the distinct flavours of GRUB.