From 96ea4dd2eaf55c5e94f1a9f13ec36fac10387158 Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Sun, 21 Mar 2010 00:41:40 -0700 Subject: [PATCH] Use python-debian's new debian package instead of debian_bundle --- apt_p2p/AptPackages.py | 4 ++-- debian/changelog | 3 ++- debian/control | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apt_p2p/AptPackages.py b/apt_p2p/AptPackages.py index 1238c65..ac966a9 100644 --- a/apt_p2p/AptPackages.py +++ b/apt_p2p/AptPackages.py @@ -38,7 +38,7 @@ from twisted.trial import unittest import apt_pkg, apt_inst from apt import OpProgress -from debian_bundle import deb822 +from debian import deb822 from apt_p2p_conf import config from Hash import HashObject @@ -228,7 +228,7 @@ class AptPackages: rel = deb822.Release(f, fields = ['MD5Sum', 'SHA1', 'SHA256']) for hash_type in rel: for file in rel[hash_type]: - self.indexrecords[cache_path].setdefault(file['name'], {})[hash_type.upper()] = (file[hash_type], file['size']) + self.indexrecords[cache_path].setdefault(str(file['name']), {})[hash_type.upper()] = (str(file[hash_type]), file['size']) f.close() diff --git a/debian/changelog b/debian/changelog index 9ab8f99..2c3f150 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ apt-p2p (0.1.6) unstable; urgency=low * Fix various documentation issues (Closes: #518590, #518549, #518548, 518550) * Add an enable variable to the /etc/default file (Closes: #518594) + * Use python-debian's new debian package instead of debian_bundle - -- Cameron Dale Sun, 21 Mar 2010 00:25:08 -0700 + -- Cameron Dale Sun, 21 Mar 2010 00:30:52 -0700 apt-p2p (0.1.5) unstable; urgency=low diff --git a/debian/control b/debian/control index b047a9c..6f54fb6 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ XS-Dm-Upload-Allowed: yes Package: apt-p2p Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web2 (>= 8.0), adduser, python-debian (>= 0.1.4), python-apt (>= 0.7.93), python-pysqlite2 (>= 2.1) +Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web2 (>= 8.0), adduser, python-debian (>= 0.1.15), python-apt (>= 0.7.93), python-pysqlite2 (>= 2.1) Provides: python-apt-p2p, python-apt-p2p-khashmir Description: apt helper for peer-to-peer downloads of Debian packages Apt-P2P is a helper for downloading Debian packages files with APT. -- 2.39.5