summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-10-02 11:34:51 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-10-02 11:34:51 +0200
commit957603e4d012d29e69fefa4737a7d640e514875b (patch)
treeb16b77d4720d98f918d868811d75f51a4a188317 /debian
parent176e587073b3e529e1494175dc0b250fd2fb79b1 (diff)
parent8d1fae9e2bb03225c81ac1f0719408618d86eb52 (diff)
downloadpython-apt-957603e4d012d29e69fefa4737a7d640e514875b.tar.gz
merge upload from Barry
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog21
1 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 56742716..8c391cad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-apt (0.8.7ubuntu2) UNRELEASEDquantal; urgency=low
+python-apt (0.8.7ubuntu3) quantal; urgency=low
* lp:~mvo/python-apt/recv-key-lp1016643:
- Only support long (v4) keyids when downloading keys and
@@ -9,6 +9,17 @@ python-apt (0.8.7ubuntu2) UNRELEASEDquantal; urgency=low
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Oct 2012 11:24:21 +0200
+python-apt (0.8.7ubuntu2) quantal; urgency=low
+
+ * python/string.cc, tests/test_lp1030278.py: Fix StrSizeToStr() so that
+ 1) it first checks for PyLong-ness so that in Python 3 on i386, it
+ will be able to convert larger numbers (via doubles rather than ints);
+ 2) before doing the conversions through the apt API, check to see if a
+ Python exception occurred, e.g. OverflowError, and return an error
+ condition in that case instead of masking it. (LP: #1030278)
+
+ -- Barry Warsaw <barry@ubuntu.com> Mon, 01 Oct 2012 18:04:35 -0400
+
python-apt (0.8.7ubuntu1) quantal; urgency=low
[ James Hunt ]
@@ -30,6 +41,14 @@ python-apt (0.8.8) UNRELEASED; urgency=low
disabled sources.list entries instead of duplicating them.
Thanks to "sampo555", LP: #1042916
+ [ Barry Warsaw ]
+ * python/string.cc, tests/test_lp1030278.py: Fix StrSizeToStr() so that
+ 1) it first checks for PyLong-ness so that in Python 3 on i386, it
+ will be able to convert larger numbers (via doubles rather than ints);
+ 2) before doing the conversions through the apt API, check to see if a
+ Python exception occurred, e.g. OverflowError, and return an error
+ condition in that case instead of masking it. (LP: #1030278)
+
[ James Hunt ]
* python/cache.cc: PkgCacheGetIsMultiArch(): Return calculated
value rather than a random one.