Merge lp:~gothicx/apport/hide_disk_labels into lp:~apport-hackers/apport/trunk

[Marco Rodrigues]

[Martin Pitt (pitti)]

Marco Rodrigues [2009-09-08 20:30 -0000]:
> - report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
> -
> + report['UdevDb'] = command_output(['sh', '-c', 'udevadm info --export-db | grep -vi label'])
> +

I don't particularly like the overhead of calling a subshell, but it's
okay (I guess it won't be much faster to filter in Python).

However, grepping for "label" is both wrong and filters too much. It
will filter out the all the /dev/disks/by-label/... lines completely.
Instead, you want to obfuscate them to say e. g.

  /dev/disks/by-label/<hidden>

and you need to obfuscate out these:

E: ID_FS_LABEL=test
E: ID_FS_LABEL_ENC=test

Please don't filter out anything, since that would make it impossible
to see whether udev in fact did detect the label correctly. Please
just rewrite it as

E: ID_FS_LABEL=<hidden>

[Martin Pitt (pitti)]

review: Needs Fixing

=== modified file 'apport/hookutils.py'
--- apport/hookutils.py	2009-09-03 14:21:12 +0000
+++ apport/hookutils.py	2009-09-08 20:27:57 +0000
@@ -94,8 +94,8 @@
 
     report['Lspci'] = command_output(['lspci','-vvnn'])
     report['Lsusb'] = command_output(['lsusb'])
-    report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
-
+    report['UdevDb'] = command_output(['sh', '-c', 'udevadm info --export-db | grep -vi label'])
+    
     dmi_dir = '/sys/class/dmi/id'
     if os.path.isdir(dmi_dir):
         for f in os.listdir(dmi_dir):