* python/cache.cc:

  - fix crash if Ver.PriorityType() returns NULL 
  - add 'lenny' template info (closes: #476364)

3 files changed, 24 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index c8963fe2..5f9c7431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,14 @@
+python-apt (0.7.7.1ubuntu1) intrepid; urgency=low
+
+  * python/cache.cc:
+    - fix crash if Ver.PriorityType() returns NULL 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Jul 2008 10:26:53 +0200
+
 python-apt (0.7.7ubuntu2) intrepid; urgency=low
 
   * data/templates/Debian.info.in:
-    - add 'lenny' template info
+    - add 'lenny' template info (closes: #476364)
   * aptsources/distinfo.py:
     - fix template matching for arch specific code (LP: #244093)
 
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) {