From 4474bb62bda8087f63a9e35edb2f6fcaa1bd96d1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Sep 2008 14:48:12 +0200 Subject: add "SelState{Unknown,Install,Hold,DeInstall,Purge}" constant --- debian/changelog | 2 +- python/apt_pkgmodule.cc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e9d5710c..dc9c2501 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.7.2) UNRELEASED; urgency=low +python-apt (0.7.8) UNRELEASED; urgency=low * python/cache.cc: - fix crash if Ver.PriorityType() returns NULL diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index fd7a83cd..fae85f00 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -517,6 +517,12 @@ extern "C" void initapt_pkg() AddInt(Dict,"CurStateConfigFiles",pkgCache::State::ConfigFiles); AddInt(Dict,"CurStateInstalled",pkgCache::State::Installed); + AddInt(Dict,"SelStateUnknown",pkgCache::State::Unknown); + AddInt(Dict,"SelStateInstall",pkgCache::State::Install); + AddInt(Dict,"SelStateHold",pkgCache::State::Hold); + AddInt(Dict,"SelStateDeInstall",pkgCache::State::DeInstall); + AddInt(Dict,"SelStatePurge",pkgCache::State::Purge); + AddInt(Dict,"InstStateOk",pkgCache::State::Ok); AddInt(Dict,"InstStateReInstReq",pkgCache::State::ReInstReq); AddInt(Dict,"InstStateHold",pkgCache::State::Hold); -- cgit v1.2.3 From bf833994a066cba0917c87105db41aa72ebe713a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Sep 2008 14:53:30 +0200 Subject: * apt/package.py: - do not return None in sourcePackageName (LP: #123062) - add "SelState{Unknown,Install,Hold,DeInstall,Purge}" constants --- apt/package.py | 3 ++- debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apt/package.py b/apt/package.py index 096b1bd1..6300b91a 100644 --- a/apt/package.py +++ b/apt/package.py @@ -186,7 +186,8 @@ class Package(object): def sourcePackageName(self): """ Return the source package name as string """ if not self._lookupRecord(): - return None + if not self._lookupRecord(UseCanidate=False): + return self._pkg.Name src = self._records.SourcePkg if src != "": return src diff --git a/debian/changelog b/debian/changelog index dc9c2501..28335af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,11 +9,13 @@ python-apt (0.7.8) UNRELEASED; urgency=low - do not change working dir in debExtractArchive() (LP: #184093) * apt/cache.py: - support "in" in apt.Cache() (LP: #251587) + * apt/package.py: + - do not return None in sourcePackageName (LP: #123062) * python/progress.cc: - when pulse() does not return a boolean assume "true" (thanks to Martin Pitt for telling me about the problem) * python/apt_pkgmodule.cc: - add "SelState{Unknown,Install,Hold,DeInstall,Purge}" constants + - add "SelState{Unknown,Install,Hold,DeInstall,Purge}" constants * aptsources/__init__.py, aptsources/distinfo.py: - run apt_pkg.init() when aptsources gets imported and not the distinfo function -- cgit v1.2.3 From 3bc4cc400ef9a6994e3ed51526811bfa2acd9927 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Sep 2008 14:58:03 +0200 Subject: fix typo --- apt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt/package.py b/apt/package.py index 6300b91a..c1c2b1e1 100644 --- a/apt/package.py +++ b/apt/package.py @@ -186,7 +186,7 @@ class Package(object): def sourcePackageName(self): """ Return the source package name as string """ if not self._lookupRecord(): - if not self._lookupRecord(UseCanidate=False): + if not self._lookupRecord(UseCandidate=False): return self._pkg.Name src = self._records.SourcePkg if src != "": -- cgit v1.2.3 From ab1eacf37a1e9125196dca105a59b186fc1783e2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Oct 2008 15:24:50 +0200 Subject: * python/metaindex.cc - fix crash when incorrect attribute is given --- debian/changelog | 2 ++ python/metaindex.cc | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28335af0..87fa1406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ python-apt (0.7.8) UNRELEASED; urgency=low - run apt_pkg.init() when aptsources gets imported and not the distinfo function - fix detection of cdrom sources and add test for it + * python/metaindex.cc + - fix crash when incorrect attribute is given -- Michael Vogt Wed, 30 Jul 2008 10:24:30 +0200 diff --git a/python/metaindex.cc b/python/metaindex.cc index c9a86ab4..45c8ef2a 100644 --- a/python/metaindex.cc +++ b/python/metaindex.cc @@ -38,6 +38,9 @@ static PyObject *MetaIndexAttr(PyObject *Self,char *Name) } return List; } + + PyErr_SetString(PyExc_AttributeError,Name); + return 0; } static PyObject *MetaIndexRepr(PyObject *Self) -- cgit v1.2.3 From fd973539e3ab0a724a69fa9a9eb6b5f2210bb3e1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Nov 2008 11:42:11 +0100 Subject: * data/templates/Ubuntu.info.in: - updated --- data/templates/Ubuntu.info.in | 55 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ 2 files changed, 57 insertions(+) diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 97554fa8..3b8f05c4 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,60 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: jaunty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +_Description: Ubuntu 9.04 'Jaunty Jackalope' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: jaunty +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*9.04 +MatchURI: cdrom:\[Ubuntu.*9.04 +_Description: Cdrom with Ubuntu 9.04 'Jaunty Jackalope' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: jaunty-security +ParentSuite: jaunty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: jaunty-updates +ParentSuite: jaunty +RepositoryType: deb +_Description: Recommended updates + +Suite: jaunty-proposed +ParentSuite: jaunty +RepositoryType: deb +_Description: Pre-released updates + +Suite: jaunty-backports +ParentSuite: jaunty +RepositoryType: deb +_Description: Unsupported updates + Suite: intrepid RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ diff --git a/debian/changelog b/debian/changelog index 87fa1406..be0fa7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ python-apt (0.7.8) UNRELEASED; urgency=low - fix detection of cdrom sources and add test for it * python/metaindex.cc - fix crash when incorrect attribute is given + * data/templates/Ubuntu.info.in: + - updated -- Michael Vogt Wed, 30 Jul 2008 10:24:30 +0200 -- cgit v1.2.3