diff options
| -rw-r--r-- | data/templates/Ubuntu.info.in | 55 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | python/apt_pkgmodule.cc | 6 | ||||
| -rw-r--r-- | python/metaindex.cc | 3 |
4 files changed, 75 insertions, 0 deletions
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 b834036a..5e4b4ff8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +python-apt (0.7.8~ubuntu1) jaunty; urgency=low + + * python/apt_pkgmodule.cc: + - add "SelState{Unknown,Install,Hold,DeInstall,Purge}" constants + * python/metaindex.cc + - fix crash when incorrect attribute is given + * data/templates/Ubuntu.info.in: + - updated + + -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 03 Nov 2008 11:46:54 +0100 + python-apt (0.7.7.1ubuntu4) intrepid; urgency=low * apt/package.py: 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); 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) |