xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 27 ++++++---------------------
debian/changelog | 7 +++++--
2 files changed, 11 insertions(+), 23 deletions(-)
New commits:
commit 6ad014fc0dd9fa21d376c594c7dfd8b8fd55c78e
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 17 11:45:02 2011 -0800
- Drop 'glxinfo' since it's been demoted to universe (LP: #714784)
- Switch to new attach_root_command_outputs() call. Prevents prompting
for password 3 times for 3 gdm files (thanks Pitti!) (LP: #716595)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a9e3f2a..64e7370 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -78,15 +78,6 @@ def command_output_quiet(command_list):
return None
return log
-def root_collect_file_contents(path):
- '''
- Returns the contents of given file collected as root user
- '''
- log = root_command_output(['cat', path])
- if log[:5] == "Error":
- return "Not present"
- return log
-
def retval(command_list):
'''
Return the command exit code
@@ -314,9 +305,10 @@ def attach_2d_info(report, ui=None):
report['xdpyinfo'] = command_output_quiet(['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:
- report['GdmLog'] = root_collect_file_contents('/var/log/gdm/:0.log')
- report['GdmLog1'] = root_collect_file_contents('/var/log/gdm/:0.log.1')
- report['GdmLog2'] = root_collect_file_contents('/var/log/gdm/:0.log.2')
+ 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'):
diff --git a/debian/changelog b/debian/changelog
index 5e27833..ff31c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-xorg (1:7.6~3ubuntu5) UNRELEASED; urgency=low
+xorg (1:7.6~3ubuntu5) natty; urgency=low
* apport/source_xorg.py:
- Add 'locale' information (for keyboards)
+ - Drop 'glxinfo' since it's been demoted to universe (LP: #714784)
+ - Switch to new attach_root_command_outputs() call. Prevents prompting
+ for password 3 times for 3 gdm files (thanks Pitti!) (LP: #716595)
- -- Bryce Harrington <bryce@ubuntu.com> Wed, 16 Feb 2011 18:37:41 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 17 Feb 2011 11:42:58 -0800
xorg (1:7.6~3ubuntu4) natty; urgency=low
commit 1437a88ca77fce683e8a1b93248df1e5058d9995
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 17 11:35:57 2011 -0800
Strip out use of glxinfo from apport hook
This tool is no longer provided in 'main' since the split-out of
mesa-utils (and it's not going to be re-added just for this). Since we
already have alternate ways of gathering the info that actually use,
there isn't much value in conditionally using it if it's present and
omitting it if not, so just drop its use entirely. For corner cases
where we do actually need the info, the user would probably need to be
told to install it anyway.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 04b69f9..a9e3f2a 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -328,8 +328,7 @@ def attach_3d_info(report, ui=None):
report['UnitySupportTest'] = ust
except AssertionError:
report['UnitySupportTest'] = 'FAILED TO RUN'
-
- report['glxinfo'] = command_output_quiet(['glxinfo'])
+
attach_file_if_exists(report,
os.path.expanduser('~/.drirc'),
'drirc')
@@ -348,14 +347,8 @@ def attach_3d_info(report, ui=None):
report['CompositorRunning'] = 'None'
# Detect software rasterizer
- glxinfo = report.get('glxinfo', '')
xorglog = report.get('XorgLog', '')
- if len(glxinfo)>0:
- if 'renderer string: Software Rasterizer' in glxinfo:
- report['Renderer'] = 'Software'
- else:
- report['Renderer'] = 'Hardware acceleration'
- elif len(xorglog)>0:
+ if len(xorglog)>0:
if 'reverting to software rendering' in xorglog:
report['Renderer'] = 'Software'
elif 'Direct rendering disabled' in xorglog:
Reply to: