From 4551baaf54faa1555b4fc40b9bf34beca8af60eb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 18 Jul 2008 15:26:48 +0100 Subject: * python/pkgsrcrecords.cc: - add "Record" attribute to the PkgSrcRecord to access the full source record --- python/pkgsrcrecords.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'python') diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc index 5e04f5fc..c698a925 100644 --- a/python/pkgsrcrecords.cc +++ b/python/pkgsrcrecords.cc @@ -89,6 +89,8 @@ static PyObject *PkgSrcRecordsAttr(PyObject *Self,char *Name) return CppPyString(Struct.Last->Maintainer()); else if (strcmp("Section",Name) == 0) return CppPyString(Struct.Last->Section()); + else if (strcmp("Record",Name) == 0) + return CppPyString(Struct.Last->AsStr()); else if (strcmp("Binaries",Name) == 0) { PyObject *List = PyList_New(0); -- cgit v1.2.3 From f05130ee834d60bbcf4245185886342584a3a4f9 Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Mon, 21 Jul 2008 17:30:43 +0200 Subject: * data/templates/Debian.info.in: - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673) * python/cache.cc: - Throw an exception rather than segfaulting when GetCache() is called before InitSystem() (closes: #369147) --- data/templates/Debian.info.in | 10 +++++----- debian/changelog | 10 ++++++++++ python/cache.cc | 5 +++++ 3 files changed, 20 insertions(+), 5 deletions(-) (limited to 'python') diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index 244e1c6b..b635de19 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -3,7 +3,7 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changel Suite: etch RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MatchURI: ftp[0-9]*\.[a-z]\.debian\.org MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors _Description: Debian 4.0 'Etch' Component: main @@ -26,7 +26,7 @@ _Description: Security updates Suite: sarge RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MatchURI: ftp[0-9]*\.[a-z]\.debian\.org MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors _Description: Debian 3.1 'Sarge' Component: main @@ -49,7 +49,7 @@ _Description: Security updates Suite: stable RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MatchURI: ftp[0-9]*\.[a-z]\.debian\.org MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors _Description: Debian current stable release Component: main @@ -62,7 +62,7 @@ _CompDescription: Non-DFSG-compatible Software Suite: testing RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MatchURI: ftp[0-9]*\.[a-z]\.debian\.org MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors _Description: Debian testing Component: main @@ -75,7 +75,7 @@ _CompDescription: Non-DFSG-compatible Software Suite: sid RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MatchURI: ftp[0-9]*\.[a-z]\.debian\.org MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors _Description: Debian 'Sid' (unstable) Component: main diff --git a/debian/changelog b/debian/changelog index c48bdafe..dd13d341 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-apt (0.7.8) unstable; urgency=low + + * data/templates/Debian.info.in: + - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673) + * python/cache.cc: + - Throw an exception rather than segfaulting when GetCache() is called + before InitSystem() (closes: #369147) + + -- Emanuele Rocca Mon, 21 Jul 2008 17:20:59 +0200 + python-apt (0.7.7) unstable; urgency=low * python/apt_pkgmodule.cc: diff --git a/python/cache.cc b/python/cache.cc index 36e49710..66a2c5d9 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -928,6 +928,11 @@ PyObject *TmpGetCache(PyObject *Self,PyObject *Args) if (PyArg_ParseTuple(Args, "|O", &pyCallbackInst) == 0) return 0; + if (_system == 0) { + PyErr_SetString(PyExc_ValueError,"_system not initialized"); + return 0; + } + pkgCacheFile *Cache = new pkgCacheFile(); if(pyCallbackInst != 0) { -- cgit v1.2.3