diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-27 10:51:26 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-02-27 10:51:26 +0100 |
| commit | 7da55cd2547325f4bc70d9eed46994bbc23d0d86 (patch) | |
| tree | 75b3a618726ec0acc62f2cdd712f3064eb5debb1 /UpdateManager | |
| parent | 8adf34a8f38e586c5a4639ab2ce558e1ab21d680 (diff) | |
| parent | 14a4901efed8583a329c09225b76855ff6bcb6e3 (diff) | |
| download | python-apt-7da55cd2547325f4bc70d9eed46994bbc23d0d86.tar.gz | |
* merged with sebi
Diffstat (limited to 'UpdateManager')
| -rw-r--r-- | UpdateManager/Common/DistInfo.py | 5 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index df244a51..102b981c 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -22,6 +22,7 @@ import os import gettext +from os import getenv import ConfigParser _ = gettext.gettext @@ -51,6 +52,8 @@ class DistInfo: pipe.close() del pipe + self.dist = dist + dist_fname = "%s/%s.info" % (base_dir, dist) dist_file = open (dist_fname) if not dist_file: @@ -100,7 +103,7 @@ class DistInfo: if __name__ == "__main__": - d = DistInfo ("Debian", "../distribution-data") + d = DistInfo ("Debian", "../../channels") print d.changelogs_uri for suite in d.suites: print suite.name diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 9aaad85d..590391b9 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -177,7 +177,7 @@ class UpdateList: #print "WARNING, keeping packages" msg = ("<big><b>%s</b></big>\n\n%s" % \ (_("Cannot install all available updates"), - _("Some updates require to remove further software. " + _("Some updates require the removal of further software. " "Use the function \"Smart Upgrade\" of the package manager " "\"Synaptic\" or run \"sudo apt-get dist-upgrade\" in a " "terminal to update your system completely."))) |