summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-07-30 10:25:23 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2008-07-30 10:25:23 +0200
commitc085ac239354d78c3093049a4c48a27f514c6da2 (patch)
tree49bd68d0a6e749c36cc04ca950bd4fd117b57026
parent4922f32e6ee40511775067241bda6d2dde539c1f (diff)
downloadpython-apt-c085ac239354d78c3093049a4c48a27f514c6da2.tar.gz
* python/cache.cc:
- fix crash if Ver.PriorityType() returns NULL
-rw-r--r--debian/changelog7
-rw-r--r--po/python-apt.pot25
-rw-r--r--python/cache.cc2
3 files changed, 23 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 571e0ae5..7bc2630e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-apt (0.7.7.2) UNRELEASED; urgency=low
+
+ * python/cache.cc:
+ - fix crash if Ver.PriorityType() returns NULL
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 30 Jul 2008 10:24:30 +0200
+
python-apt (0.7.7.1) unstable; urgency=low
* data/templates/Debian.info.in:
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 7125757c..9dc6e202 100644
--- a/po/python-apt.pot
+++ b/po/python-apt.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-18 15:22+0100\n"
+"POT-Creation-Date: 2008-07-30 10:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -188,7 +188,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/templates/Ubuntu.info.in:383 ../data/templates/Debian.info.in:94
+#: ../data/templates/Ubuntu.info.in:383 ../data/templates/Debian.info.in:117
msgid "Officially supported"
msgstr ""
@@ -260,46 +260,51 @@ msgstr ""
#. Description
#: ../data/templates/Debian.info.in:8
-msgid "Debian 4.0 'Etch' "
+msgid "Debian 5.0 'Lenny' "
msgstr ""
#. Description
#: ../data/templates/Debian.info.in:31
+msgid "Debian 4.0 'Etch' "
+msgstr ""
+
+#. Description
+#: ../data/templates/Debian.info.in:54
msgid "Debian 3.1 'Sarge'"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:42
+#: ../data/templates/Debian.info.in:65
msgid "Proposed updates"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:47
+#: ../data/templates/Debian.info.in:70
msgid "Security updates"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:54
+#: ../data/templates/Debian.info.in:77
msgid "Debian current stable release"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:67
+#: ../data/templates/Debian.info.in:90
msgid "Debian testing"
msgstr ""
#. Description
-#: ../data/templates/Debian.info.in:92
+#: ../data/templates/Debian.info.in:115
msgid "Debian 'Sid' (unstable)"
msgstr ""
#. CompDescription
-#: ../data/templates/Debian.info.in:96
+#: ../data/templates/Debian.info.in:119
msgid "DFSG-compatible Software with Non-Free Dependencies"
msgstr ""
#. CompDescription
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:121
msgid "Non-DFSG-compatible Software"
msgstr ""
diff --git a/python/cache.cc b/python/cache.cc
index 66a2c5d9..bd280dec 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -599,7 +599,7 @@ static PyObject *VersionAttr(PyObject *Self,char *Name)
else if (strcmp("Priority",Name) == 0)
return Py_BuildValue("i",Ver->Priority);
else if (strcmp("PriorityStr",Name) == 0)
- return PyString_FromString(Ver.PriorityType());
+ return Safe_FromString(Ver.PriorityType());
else if (strcmp("Downloadable", Name) == 0)
return Py_BuildValue("b", Ver.Downloadable());
else if (strcmp("TranslatedDescription", Name) == 0) {