[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg: Changes to 'ubuntu'



 debian/apport/source_xorg.py |    6 ++++++
 debian/changelog             |    3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 88f086bcfcf2798b39f4866a25af8de294db7339
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Mon Mar 9 16:35:43 2009 -0700

    Add detection of fglrx module loaded in kernel

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 6a8eabf..2266746 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -98,6 +98,12 @@ def add_info(report):
         pass
 
     try:
+        script = subprocess.Popen(['sh', '-c', 'grep fglrx /var/log/kern.log'], stdout=subprocess.PIPE)
+        report['fglrx-loaded'] = script.communicate()[0]
+    except OSError:
+        pass
+
+    try:
         script = subprocess.Popen(['xrandr', '--verbose'], stdout=subprocess.PIPE)
         report['Xrandr'] = script.communicate()[0]
     except OSError:
diff --git a/debian/changelog b/debian/changelog
index ef801b8..f7bfc49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.4~5ubuntu14) UNRELEASED; urgency=low
     unix domain sockets instead of forcing TCP since hostname validation
     is not necessary in this case.
     (LP: #276357)
+  * apport/source_xorg.py: Detect presence of fglrx loaded in kernel
 
- -- Bryce Harrington <bryce@ubuntu.com>  Wed, 04 Mar 2009 01:39:08 -0800
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 09 Mar 2009 16:34:27 -0700
 
 xorg (1:7.4~5ubuntu13) jaunty; urgency=low
 


Reply to: