diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-17 18:14:35 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-05-17 18:14:35 +0200 |
| commit | b47ce124b9672ea58f87dd2380c409566ffcfefd (patch) | |
| tree | a3a9ebab094bf88a7bb7a1eb8b73826736496ab8 | |
| parent | 53809b5b5c560cab8da18649a949228f7458edef (diff) | |
| download | python-apt-b47ce124b9672ea58f87dd2380c409566ffcfefd.tar.gz | |
* prepared new upload with cherry picked patch from mainline
| -rw-r--r-- | apt/package.py | 11 | ||||
| -rw-r--r-- | debian/changelog | 9 |
2 files changed, 16 insertions, 4 deletions
diff --git a/apt/package.py b/apt/package.py index 66bfd72b..9f329069 100644 --- a/apt/package.py +++ b/apt/package.py @@ -49,7 +49,7 @@ class Package(object): # check if we found a version if ver == None: - #print "No version for: %s (Candidate: %s)" % (self._pkg.Name, UseCandidate) + print "No version for: %s (Candidate: %s)" % (self._pkg.Name, UseCandidate) return False if ver.FileList == None: @@ -149,13 +149,15 @@ class Package(object): def summary(self): """ Return the short description (one line summary) """ - self._lookupRecord() + if not self._lookupRecord(): + return "" return self._records.ShortDesc summary = property(summary) def description(self, format=True): """ Return the formated long description """ - self._lookupRecord() + if not self._lookupRecord(): + return "" desc = "" for line in string.split(self._records.LongDesc, "\n"): tmp = string.strip(line) @@ -168,7 +170,8 @@ class Package(object): def rawDescription(self): """ return the long description (raw)""" - self._lookupRecord() + if not self._lookupRecord(): + return "" return self._records.LongDesc rawDescription = property(rawDescription) diff --git a/debian/changelog b/debian/changelog index 6859407c..9822dc42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.6.16.2ubuntu7) dapper; urgency=low + + * apt/package.py: + - check if _lookupRecord() succeeded when checking + maintainer or description (fixes invalid descriptions under + rare circumstances in gnome-app-install) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 May 2006 18:12:58 +0200 + python-apt (0.6.16.2ubuntu6) dapper; urgency=low * debian/control: |