Apport

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

  1. hide_disk_label
  2. Merge into trunk
Proposed by Marco Rodrigues
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gothicx/apport/hide_disk_label
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 18 lines
1 file modified
apport/hookutils.py (+8/-0)
To merge this branch: bzr merge lp:~gothicx/apport/hide_disk_label
Reviewer Review Type Date Requested Status
Apport upstream developers Pending
Review via email: mp+13868@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apport/hookutils.py'
2--- apport/hookutils.py 2009-10-13 23:41:16 +0000
3+++ apport/hookutils.py 2009-10-23 19:55:18 +0000
4@@ -96,6 +96,14 @@
5 report['Lsusb'] = command_output(['lsusb'])
6 report['UdevDb'] = command_output(['udevadm', 'info', '--export-db'])
7
8+ # anonymize Udev hdd partition label
9+ report['UdevLog'] = re.sub('ID_FS_LABEL=(.*)', 'ID_FS_LABEL=<hidden>', report['UdevLog'])
10+ report['UdevLog'] = re.sub('ID_FS_LABEL_ENC=(.*)', 'ID_FS_LABEL_ENC=<hidden>', report['UdevLog'])
11+ report['UdevLog'] = re.sub('by-label/(.*)', 'by-label/<hidden>', report['UdevLog'])
12+ report['UdevDb'] = re.sub('ID_FS_LABEL=(.*)', 'ID_FS_LABEL=<hidden>', report['UdevDb'])
13+ report['UdevDb'] = re.sub('ID_FS_LABEL_ENC=(.*)', 'ID_FS_LABEL_ENC=<hidden>', report['UdevDb'])
14+ report['UdevDb'] = re.sub('by-label/(.*)', 'by-label/<hidden>', report['UdevDb'])
15+
16 dmi_dir = '/sys/class/dmi/id'
17 if os.path.isdir(dmi_dir):
18 for f in os.listdir(dmi_dir):

Subscribers

People subscribed via source and target branches