xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 13 +++++++------
debian/changelog | 10 ++++++++++
2 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 3997f9a4d636468846103ae3b714145cbd0b31e9
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Mar 2 11:29:31 2011 -0800
* apport/source_xorg.py:
- Fix typo in nvidia data collection
- Only collect gdm logs if gdm appears to be present, so as not to
cause "file not found" errors when it isn't.
(LP: #722914)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index c9f4265..a36fd4a 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -307,11 +307,12 @@ def attach_2d_info(report, ui=None):
# For font dpi bugs
attach_command_output(report, ['xdpyinfo'], 'xdpyinfo')
- if ui and 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?") == True:
- attach_root_command_outputs(report, {
- 'GdmLog': 'cat /var/log/gdm/:0.log',
- 'GdmLog1': 'cat /var/log/gdm/:0.log.1',
- 'GdmLog2': 'cat /var/log/gdm/:0.log.2'})
+ if os.path.lexists('/var/log/gdm'):
+ if ui and 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?") == True:
+ attach_root_command_outputs(report, {
+ 'GdmLog': 'cat /var/log/gdm/:0.log',
+ 'GdmLog1': 'cat /var/log/gdm/:0.log.1',
+ 'GdmLog2': 'cat /var/log/gdm/:0.log.2'})
def attach_3d_info(report, ui=None):
if os.environ.get('DISPLAY'):
@@ -399,7 +400,7 @@ def attach_nvidia_info(report, ui=None):
attach_file(report, logfile)
if os.path.lexists('/usr/lib/nvidia-current/bin/nvidia-bug-report.sh'):
- if retval(['/usr/lib/nvidia-current/bin/nvidia-bug-report.sh'] == 0):
+ if retval(['/usr/lib/nvidia-current/bin/nvidia-bug-report.sh']) == 0:
attach_file_if_exists(report, os.path.expanduser('~/nvidia-bug-report.log.gz'),
'NvidiaBugReportLog')
diff --git a/debian/changelog b/debian/changelog
index 8e2135e..960940e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg (1:7.6~3ubuntu11) natty; urgency=low
+
+ * apport/source_xorg.py:
+ - Fix typo in nvidia data collection
+ - Only collect gdm logs if gdm appears to be present, so as not to
+ cause "file not found" errors when it isn't.
+ (LP: #722914)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 02 Mar 2011 10:56:02 -0800
+
xorg (1:7.6~3ubuntu10) natty; urgency=low
* apport/source_xorg.py:
Reply to: