diff options
| author | Sebastian Heinlein <sebi@sebi-laptop> | 2007-04-24 19:45:29 +0200 |
|---|---|---|
| committer | Sebastian Heinlein <sebi@sebi-laptop> | 2007-04-24 19:45:29 +0200 |
| commit | d57e7084d4bb261f5201a44b81796fb7e47e6ea0 (patch) | |
| tree | 7ad0dfefd868d78cc3fa45946ab7e4917d34213f | |
| parent | 206d2e07e1ed8eb28705841b79e8c977e39ecf1b (diff) | |
| parent | 520c5e2ea5b839286fe6e1f0783727fe0e692eed (diff) | |
| download | python-apt-d57e7084d4bb261f5201a44b81796fb7e47e6ea0.tar.gz | |
* merge with mvo
* update debian changelog
| -rw-r--r-- | apt/package.py | 2 | ||||
| -rw-r--r-- | debian/changelog | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/apt/package.py b/apt/package.py index f7a1a8ac..b82f1aa0 100644 --- a/apt/package.py +++ b/apt/package.py @@ -223,7 +223,7 @@ class Package(object): s = unicode(self._records.LongDesc,"utf-8") except UnicodeDecodeError,e: s = _("Invalid unicode in description for '%s' (%s). " - "Please report.") % (name,e) + "Please report.") % (self.name,e) for line in string.split(s,"\n"): tmp = string.strip(line) if tmp == ".": diff --git a/debian/changelog b/debian/changelog index b5c54084..55ec423c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,16 +2,20 @@ python-apt (0.6.20ubuntu16) feisty; urgency=low * Fix the addition of of sources that are already enabled but not with all components - fix LP#98795 + * Handle changes of forced servers of child repositories in a more + sane way - fix LP#85060 - -- Sebastian Heinlein <sebi@sebi-laptop> Wed, 4 Apr 2007 11:31:33 +0200 + -- Sebastian Heinlein <sebi@sebi-laptop> Tue, 24 Apr 2007 19:44:00 +0200 -python-apt (0.6.20ubuntu15) unstable; urgency=low +python-apt (0.6.20ubuntu15) feisty; urgency=low [ Sebastian Heinlein ] * Update the mirror lists from Launchpad * Only include http and ftp servers - LP#99060 + [Michael Vogt] + * fix error in invalid unicode handler (LP#99753) - -- Sebastian Heinlein <glatzor@ubuntu.com> Mon, 02 Apr 2007 00:02:53 +0200 + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 2 Apr 2007 14:25:31 +0200 python-apt (0.6.20ubuntu14) feisty; urgency=low @@ -25,7 +29,7 @@ python-apt (0.6.20ubuntu14) feisty; urgency=low * remove an oboslete function * fix the url comparision with trainling slashes - LP#95031 - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Mar 2007 18:47:22 +0200 python-apt (0.6.20ubuntu13) feisty; urgency=low |