diff options
| author | glatzor@ubuntu.com <> | 2006-08-02 21:41:27 +0200 |
|---|---|---|
| committer | glatzor@ubuntu.com <> | 2006-08-02 21:41:27 +0200 |
| commit | 1b2f3650122a3c7d1997287b8d915f9f54402549 (patch) | |
| tree | fbca309b7619f20bb2211a2a7d2294374d1c8fec /UpdateManager/Common | |
| parent | c0e73bb5c6213aa0bc9e0609f9f1d7da254ea2b1 (diff) | |
| download | python-apt-1b2f3650122a3c7d1997287b8d915f9f54402549.tar.gz | |
* use -s option instead of the pipe to cut to get lsb information
* make the origin matcher distribution neutral
* introduce a UpdateOrigin class to make the origins sortable (by
importance)
Diffstat (limited to 'UpdateManager/Common')
| -rw-r--r-- | UpdateManager/Common/DistInfo.py | 2 | ||||
| -rw-r--r-- | UpdateManager/Common/aptsources.py | 2 |
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 |