diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 13:53:51 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 13:53:51 +0100 |
| commit | 44163ca57ac3f6311e05b1521ac03f120e67d520 (patch) | |
| tree | df1d06f27b47e2855c7dbd07182f7008a88fda18 /apt | |
| parent | d02c0c3a2ded6afcc25f69c8de4b6cc396854027 (diff) | |
| parent | 375920c5172a5f60acba02b73c3b32ffbccc8ab2 (diff) | |
| download | python-apt-44163ca57ac3f6311e05b1521ac03f120e67d520.tar.gz | |
merged from lp:~mvo/python-apt/mvo
Diffstat (limited to 'apt')
| -rw-r--r-- | apt/debfile.py | 15 | ||||
| -rw-r--r-- | apt/progress/gtk2.py | 3 |
2 files changed, 4 insertions, 14 deletions
diff --git a/apt/debfile.py b/apt/debfile.py index 160a4a72..ab24c50b 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -94,7 +94,8 @@ class DebPackage(object): return pkgname elif self._cache.is_virtual_package(pkgname): return pkgname - elif self._cache[pkgname].candidate.architecture == "all": + elif (pkgname in self._cache and + self._cache[pkgname].candidate.architecture == "all"): return pkgname # now do the real multiarch checking multiarch_pkgname = "%s:%s" % (pkgname, self._multiarch) @@ -159,10 +160,6 @@ class DebPackage(object): def _satisfy_or_group(self, or_group): """Try to satisfy the or_group.""" - - or_found = False - virtual_pkg = None - for dep in or_group: depname, ver, oper = dep @@ -232,10 +229,6 @@ class DebPackage(object): def _check_conflicts_or_group(self, or_group): """Check the or-group for conflicts with installed pkgs.""" self._dbg(2, "_check_conflicts_or_group(): %s " % (or_group)) - - or_found = False - virtual_pkg = None - for dep in or_group: depname = dep[0] ver = dep[1] @@ -513,7 +506,7 @@ class DebPackage(object): for pkg in self._need_pkgs: try: self._cache[pkg].mark_install(from_user=False) - except SystemError as e: + except SystemError: self._failure_string = _("Cannot install '%s'") % pkg self._cache.clear() return False @@ -606,7 +599,7 @@ class DebPackage(object): # auto-convert to hex try: data = unicode(data, "utf-8") - except Exception as e: + except Exception: new_data = _("Automatically converted to printable ascii:\n") new_data += self.to_strish(data) return new_data diff --git a/apt/progress/gtk2.py b/apt/progress/gtk2.py index b5794e92..c2635ca0 100644 --- a/apt/progress/gtk2.py +++ b/apt/progress/gtk2.py @@ -22,9 +22,6 @@ # USA """GObject-powered progress classes and a GTK+ status widget.""" -import os -import time - import pygtk pygtk.require('2.0') import gtk |