From 2bd5e2dd14365d8d7e72b7671ed57c6b681b9072 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 12 Oct 2006 14:39:50 +0200 Subject: * remove dh_python --- debian/changelog | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3ab21a51..0dfa9381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-apt (0.6.21) unstable; urgency=low - fix incorrect use of PyMem_DEL(), use pyObject_DEL() instead. This fixes a nasty segfault with python2.5 (lp: 63226) + * debian/rules: Remove dh_python call. -- diff --git a/debian/rules b/debian/rules index ee159b89..7299f554 100755 --- a/debian/rules +++ b/debian/rules @@ -49,12 +49,11 @@ binary-arch: build for PY in $(PYTHON); do \ /usr/bin/$$PY setup.py install --prefix=`pwd`/debian/python-apt/usr; \ done - + dh_installdocs dh_installchangelogs dh_installexamples dh_pycentral - dh_python dh_strip dh_compress dh_fixperms -- cgit v1.2.3 From 4ae6dbf9a654189b1f07e8056fff9a3b877a6e2d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Nov 2006 22:04:49 +0100 Subject: * apt/progress.py: - protect against unparsable strings send from dpkg --- apt/progress.py | 7 ++++++- debian/changelog | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt/progress.py b/apt/progress.py index 8ac0e1dc..5169adf7 100644 --- a/apt/progress.py +++ b/apt/progress.py @@ -175,7 +175,12 @@ class InstallProgress(DumbInstallProgress): if self.read.endswith("\n"): s = self.read #print s - (status, pkg, percent, status_str) = string.split(s, ":") + try: + (status, pkg, percent, status_str) = string.split(s, ":",3) + except ValueError, e: + # silently ignore lines that can't be parsed + self.read = "" + return #print "percent: %s %s" % (pkg, float(percent)/100.0) if status == "pmerror": self.error(pkg,status_str) diff --git a/debian/changelog b/debian/changelog index 0dfa9381..9451428c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ python-apt (0.6.21) unstable; urgency=low instead. This fixes a nasty segfault with python2.5 (lp: 63226) * debian/rules: Remove dh_python call. + * protect against not-parsable strings send from dpkg (lp: 68553) -- -- cgit v1.2.3 From 3c393390f10b5ecfb3891fb89f199e2610d9246e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 11:46:28 +0100 Subject: * python/pkgrecords.cc: - export SHA1Sum() as well * debian/changelog: - updated --- debian/changelog | 9 ++++++--- python/pkgrecords.cc | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9451428c..6b52ff44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,16 @@ -python-apt (0.6.21) unstable; urgency=low +python-apt (0.6.21) UNRELEASED; urgency=low * python/generic.h: - fix incorrect use of PyMem_DEL(), use pyObject_DEL() instead. This fixes a nasty segfault with python2.5 (lp: 63226) + * python/pkgrecords.cc: + - export SHA1Hash() as well * debian/rules: Remove dh_python call. - * protect against not-parsable strings send from dpkg (lp: 68553) + * apt/progress.cc: + - protect against not-parsable strings send from dpkg (lp: 68553) - -- + -- Michael Vogt Tue, 19 Dec 2006 11:34:59 +0100 python-apt (0.6.20) unstable; urgency=low diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc index ec78f554..4a5556f2 100644 --- a/python/pkgrecords.cc +++ b/python/pkgrecords.cc @@ -63,6 +63,8 @@ static PyObject *PkgRecordsAttr(PyObject *Self,char *Name) return CppPyString(Struct.Last->FileName()); else if (strcmp("MD5Hash",Name) == 0) return CppPyString(Struct.Last->MD5Hash()); + else if (strcmp("SHA1Hash",Name) == 0) + return CppPyString(Struct.Last->SHA1Hash()); else if (strcmp("SourcePkg",Name) == 0) return CppPyString(Struct.Last->SourcePkg()); else if (strcmp("Maintainer",Name) == 0) -- cgit v1.2.3 From d27f389612249dcfb8b979d8487c39514dd6350b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 13:32:31 +0100 Subject: * debian/changelog: - updated changelog --- debian/changelog | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6b52ff44..8104a4fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.6.21) UNRELEASED; urgency=low +python-apt (0.6.20) UNRELEASED; urgency=low * python/generic.h: - fix incorrect use of PyMem_DEL(), use pyObject_DEL() @@ -9,11 +9,6 @@ python-apt (0.6.21) UNRELEASED; urgency=low * debian/rules: Remove dh_python call. * apt/progress.cc: - protect against not-parsable strings send from dpkg (lp: 68553) - - -- Michael Vogt Tue, 19 Dec 2006 11:34:59 +0100 - -python-apt (0.6.20) unstable; urgency=low - * python/pkgmanager.cc: - fix typo (closes: #382853) * debian/control: @@ -29,7 +24,7 @@ python-apt (0.6.20) unstable; urgency=low * python/progress.cc: - fix memleak (lp: #43096) - -- Michael Vogt Mon, 2 Oct 2006 17:29:49 +0200 + -- Michael Vogt Tue, 19 Dec 2006 13:32:11 +0100 python-apt (0.6.19) unstable; urgency=low -- cgit v1.2.3 From a775bc53771d2c0665205fbec407014eea239682 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 13:32:53 +0100 Subject: * debian/changelog: - and upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8104a4fb..79e6d078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.6.20) UNRELEASED; urgency=low +python-apt (0.6.20) unstable; urgency=low * python/generic.h: - fix incorrect use of PyMem_DEL(), use pyObject_DEL() -- cgit v1.2.3