debian/apport/source_xorg.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 20ad5b45272a611ab538e09e93fdd42cc98753a7
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Mar 1 18:39:23 2010 +1100
apport hook: use cat with root_command_output to read gdm log files
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 43309ee..43e58b1 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -103,9 +103,9 @@ def add_info(report, ui):
response = ui.yesno("Your gdm log files may help developers diagnose the
bug, but may contain sensitive information. Do you want to include these logs
in your bug report?")
if response == True:
- attach_file_if_exists(report, '/var/log/gdm/:0.log', 'GdmLog')
- attach_file_if_exists(report, '/var/log/gdm/:0.log.1', 'GdmLog1')
- attach_file_if_exists(report, '/var/log/gdm/:0.log.2', 'GdmLog2')
+ report['GdmLog'] = root_command_output(['cat', '/var/log/gdm/:0.log'])
+ report['GdmLog1'] = root_command_output(['cat',
'/var/log/gdm/:0.log.1'])
+ report['GdmLog2'] = root_command_output(['cat',
'/var/log/gdm/:0.log.2'])
report.setdefault('Tags', '')
report['Tags'] += ' ' + ' '.join(tags)
commit a6ea8caa1d228ca34bde499a732b7300777b9b91
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Mar 1 18:22:58 2010 +1100
Fix minor issues in apport hook
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 7ba696d..43309ee 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -22,11 +22,11 @@ def installed_version(pkg):
output = script.communicate()[0]
return output.split('\n')[1].replace("Installed: ", "")
-def add_info(report):
+def add_info(report, ui):
tags = []
# Build System Environment
- codename = command_output(['lsb_release','-c']).split(": ")[1]
+ codename = command_output(['lsb_release','-sc'])
tags.append(codename)
report['system'] = "distro: Ubuntu\n"
@@ -39,7 +39,7 @@ def add_info(report):
"libgl1-mesa-glx",
"libdrm2",
"xserver-xorg-video-intel",
- "xserver-xorg-video-ati"
+ "xserver-xorg-video-ati",
"xserver-xorg-video-nouveau"
])
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nm0e0-0006se...@alioth.debian.org
