xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 21 +++++++++++++++++++--
debian/changelog | 12 ++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
New commits:
commit 1251be1494cce567c4c91540824ba465e9878666
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 1 17:01:06 2011 -0800
Check for null when checking for upgrades. Can fail if apt.log is empty or unreadable. (LP: #723061)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index da10dc0..585accb 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -247,7 +247,7 @@ def attach_dist_upgrade_status(report, ui=None):
# TODO: Not sure if this is quite exactly what I want, but close...
upgraded = command_output_quiet(
['head', '-n', '1', '/var/log/dist-upgrade/apt.log'])
- if len(upgraded) > 0:
+ if upgraded and len(upgraded) > 0:
report['DistUpgraded'] = "Yes, recently upgraded %s" %(upgraded)
else:
report['DistUpgraded'] = "Unknown"
diff --git a/debian/changelog b/debian/changelog
index a3dafc2..b99fd8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xorg (1:7.6~3ubuntu9) natty; urgency=low
- Collect update-alternatives info in case of proprietary drivers
- Generate nvidia-bug-report.log.gz if -nvidia loaded
- Don't quell errors calling unity_support_test (LP: #710630)
+ - Check for null when checking for upgrades. Can fail if apt.log is
+ empty or unreadable. (LP: #723061)
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 01 Mar 2011 16:52:41 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 01 Mar 2011 16:58:31 -0800
xorg (1:7.6~3ubuntu8) natty; urgency=low
commit b96c2a7706d9e189d65c2e78f659ecf01a330b98
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 1 16:54:00 2011 -0800
Don't quell errors calling unity_support_test (LP: #710630)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 975eff1..da10dc0 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -314,7 +314,7 @@ def attach_3d_info(report, ui=None):
if os.environ.get('DISPLAY'):
if os.path.lexists('/usr/lib/nux/unity_support_test'):
try:
- ust = command_output_quiet([
+ ust = command_output([
'/usr/lib/nux/unity_support_test', '-p'])
ust = ust.replace('\x1b','').replace('[0;38;48m','').replace('[1;32;48m','')
report['UnitySupportTest'] = ust
diff --git a/debian/changelog b/debian/changelog
index 4ea047d..a3dafc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.6~3ubuntu9) natty; urgency=low
- Collect jockey info in the case of proprietary drivers
- Collect update-alternatives info in case of proprietary drivers
- Generate nvidia-bug-report.log.gz if -nvidia loaded
+ - Don't quell errors calling unity_support_test (LP: #710630)
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 01 Mar 2011 16:49:31 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 01 Mar 2011 16:52:41 -0800
xorg (1:7.6~3ubuntu8) natty; urgency=low
commit 71eeaf9ed377efa967641522ba4d550e59bb68ef
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 1 16:51:35 2011 -0800
* apport/source_xorg.py:
- Collect jockey info in the case of proprietary drivers
- Collect update-alternatives info in case of proprietary drivers
- Generate nvidia-bug-report.log.gz if -nvidia loaded
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 9aca105..975eff1 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -394,12 +394,23 @@ def attach_nvidia_info(report, ui=None):
if os.path.basename(logfile) != 'README':
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):
+ attach_file_if_exists(report, os.path.expanduser('~/nvidia-bug-report.log.gz'),
+ 'NvidiaBugReportLog')
+
if os.environ.get('DISPLAY'):
# Attach output of nvidia-settings --query if we've got a display
# to connect to.
report['nvidia-settings'] = command_output_quiet(
['nvidia-settings', '-q', 'all'])
+ report['JockeyStatus'] = command_output_quiet(
+ ['jockey-text', '-l'])
+
+ report['GlConf'] = command_output_quiet(
+ ['update-alternatives', '--display', 'gl_conf'])
+
# File any X crash with -nvidia involved with the -nvidia bugs
if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not in report):
if report.get('SourcePackage','Unknown') in core_x_packages:
@@ -410,6 +421,12 @@ def attach_fglrx_info(report, ui=None):
report['version.fglrx-installer'] = package_versions("fglrx-installer")
+ report['JockeyStatus'] = command_output_quiet(
+ ['jockey-text', '-l'])
+
+ report['GlConf'] = command_output_quiet(
+ ['update-alternatives', '--display', 'gl_conf'])
+
# File any X crash with -fglrx involved with the -fglrx bugs
if report.get('SourcePackage','Unknown') in core_x_packages:
if (report.get('ProblemType', '') == 'Crash' and 'Traceback' not in report):
diff --git a/debian/changelog b/debian/changelog
index 7fbc233..4ea047d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6~3ubuntu9) natty; urgency=low
+
+ * apport/source_xorg.py:
+ - Collect jockey info in the case of proprietary drivers
+ - Collect update-alternatives info in case of proprietary drivers
+ - Generate nvidia-bug-report.log.gz if -nvidia loaded
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 01 Mar 2011 16:49:31 -0800
+
xorg (1:7.6~3ubuntu8) natty; urgency=low
[Brian Murray]
Reply to: