debian/apport/source_xorg.py | 6 ++++--
debian/changelog | 6 +++++-
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit a5db85b1f915443dee7112d4c8e74a873d69a30a
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Thu Mar 12 10:44:48 2009 -0700
Patch from Tormod to call grep fglrx directly instead of shelling out.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 2266746..73e79ba 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -98,8 +98,10 @@ 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]
+ script = subprocess.Popen(['grep', 'fglrx', '/var/log/kern.log',
'/proc/modules'], stdout=subprocess.PIPE)
+ matches = script.communicate()[0]
+ if (matches):
+ report['fglrx-loaded'] = matches
except OSError:
pass
diff --git a/debian/changelog b/debian/changelog
index c8f1cca..975baf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xorg (1:7.4~5ubuntu16) UNRELEASED; urgency=low
+ [Tormod Volden]
+ * apport/source_xorg.py: Use grep directly instead of shelling out
+
+ [Bryce Harrington]
* x11-common.links: Add apport support for a several more packages.
* local/Xsession.d/60x11-localhost: Also redirect stderr in an sh-safe
fashion
- -- Bryce Harrington <br...@ubuntu.com> Wed, 11 Mar 2009 09:43:37 -0700
+ -- Bryce Harrington <br...@ubuntu.com> Thu, 12 Mar 2009 10:43:30 -0700
xorg (1:7.4~5ubuntu15) jaunty; urgency=low
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
