summaryrefslogtreecommitdiff
path: root/UpdateManager/Common
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-08-03 17:35:13 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-08-03 17:35:13 +0200
commit929083adc50a07221eacdb369b094e04ac7d7214 (patch)
tree5a67673b8b09dd54bd6e1555d64d54e0a62342a1 /UpdateManager/Common
parent7b05e4d20c50c14fee61be8555646039ae04f419 (diff)
parent4a5e26b3793e366c0dcdd0b3017bff421673a5f4 (diff)
downloadpython-apt-929083adc50a07221eacdb369b094e04ac7d7214.tar.gz
* merged from glatzor
Diffstat (limited to 'UpdateManager/Common')
-rw-r--r--UpdateManager/Common/DistInfo.py2
-rw-r--r--UpdateManager/Common/aptsources.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py
index 7d2d37ad..79d5356c 100644
--- a/UpdateManager/Common/DistInfo.py
+++ b/UpdateManager/Common/DistInfo.py
@@ -56,7 +56,7 @@ class DistInfo:
self.suites = []
if not dist:
- pipe = os.popen("lsb_release -i | cut -d : -f 2-")
+ pipe = os.popen("lsb_release -i -s")
dist = pipe.read().strip()
pipe.close()
del pipe
diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py
index 3d317b15..fd77fe63 100644
--- a/UpdateManager/Common/aptsources.py
+++ b/UpdateManager/Common/aptsources.py
@@ -452,7 +452,7 @@ class Distribution:
# get the LSB information
lsb_info = []
for lsb_option in ["-i", "-c", "-d", "-r"]:
- pipe = os.popen("lsb_release %s | cut -d : -f 2-" % lsb_option)
+ pipe = os.popen("lsb_release %s -s" % lsb_option)
lsb_info.append(pipe.read().strip())
del pipe
(self.id, self.codename, self.description, self.release) = lsb_info