diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-09 09:20:15 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-08-09 09:20:15 +0200 |
| commit | 325b998b1537fef5e0277f8ad86f38bd46cf05d7 (patch) | |
| tree | cf056124d0904f766aa9721780111cc17b44ef68 | |
| parent | cf6cbda23e3b78beb6ce2ef84c5445200b1dfc08 (diff) | |
| parent | 3a0e654a8a5935c148bc95a9f9cb5d7786aae825 (diff) | |
| download | python-apt-325b998b1537fef5e0277f8ad86f38bd46cf05d7.tar.gz | |
* apt/package.py:
- fix py3 compatbility with print
| -rw-r--r-- | apt/package.py | 8 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/apt/package.py b/apt/package.py index 9223ed22..dbc5b23e 100644 --- a/apt/package.py +++ b/apt/package.py @@ -545,8 +545,8 @@ class Version(object): base = os.path.basename(self._records.filename) destfile = os.path.join(destdir, base) if _file_is_same(destfile, self.size, self._records.md5_hash): - print 'Ignoring already existing file:', destfile - return + print('Ignoring already existing file: %s' % destfile) + return os.path.abspath(destfile) acq = apt_pkg.Acquire(progress or apt.progress.text.AcquireProgress()) acqfile = apt_pkg.AcquireFile(acq, self.uri, self._records.md5_hash, self.size, base, destfile=destfile) @@ -555,7 +555,7 @@ class Version(object): if acqfile.status != acqfile.STAT_DONE: raise FetchError("The item %r could not be fetched: %s" % (acqfile.destfile, acqfile.error_text)) - print self._records.filename + return os.path.abspath(destfile) def fetch_source(self, destdir="", progress=None, unpack=True): @@ -594,7 +594,7 @@ class Version(object): if type_ == 'dsc': dsc = destfile if _file_is_same(destfile, size, md5): - print 'Ignoring already existing file:', destfile + print('Ignoring already existing file: %s' % destfile) continue files.append(apt_pkg.AcquireFile(acq, src.index.archive_uri(path), md5, size, base, destfile=destfile)) diff --git a/debian/changelog b/debian/changelog index 681ce97d..62721860 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.8.0ubuntu3) oneiric; urgency=low + + * apt/package.py: + - fix py3 compatbility with print + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 09:19:42 +0200 + python-apt (0.8.0ubuntu2) oneiric; urgency=low * disable tests if /etc/apt/sources.list is not readable |