From 91e65ee1efd73fdbf507c2683bc6cc64fee9b37c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Aug 2008 11:33:53 +0200 Subject: add correct bugnumber --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5f9c7431..65f95664 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ python-apt (0.7.7.1ubuntu1) intrepid; urgency=low * python/cache.cc: - - fix crash if Ver.PriorityType() returns NULL + - fix crash if Ver.PriorityType() returns NULL (LP: #253255) -- Michael Vogt Wed, 30 Jul 2008 10:26:53 +0200 -- cgit v1.2.3 From 8ea16468b4be4f322ef519bc36d33969dc4d3e54 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 1 Sep 2008 11:37:48 +0100 Subject: Rebuild against current apt on hppa. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b70b925..85aec8f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.7.7.1ubuntu3) UNRELEASED; urgency=low + + * Rebuild against current apt on hppa. + + -- Colin Watson Mon, 01 Sep 2008 11:33:33 +0100 + python-apt (0.7.7.1ubuntu2) intrepid; urgency=low * python/cache.cc: -- cgit v1.2.3 From 6f6671a3375128c075a20927b58ad9d7b4bbb543 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 1 Sep 2008 11:38:14 +0100 Subject: releasing version 0.7.7.1ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 85aec8f3..c6e8313c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -python-apt (0.7.7.1ubuntu3) UNRELEASED; urgency=low +python-apt (0.7.7.1ubuntu3) intrepid; urgency=low * Rebuild against current apt on hppa. - -- Colin Watson Mon, 01 Sep 2008 11:33:33 +0100 + -- Colin Watson Mon, 01 Sep 2008 11:37:58 +0100 python-apt (0.7.7.1ubuntu2) intrepid; urgency=low -- cgit v1.2.3 From e7811c1935bb36b35bfe0ba30056ac4209a27377 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Sep 2008 14:57:22 +0200 Subject: * apt/package.py: - do not return None in sourcePackageName (LP: #123062) --- apt/package.py | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt/package.py b/apt/package.py index 096b1bd1..c1c2b1e1 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(UseCandidate=False): + return self._pkg.Name src = self._records.SourcePkg if src != "": return src diff --git a/debian/changelog b/debian/changelog index cc4c2aef..b834036a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ python-apt (0.7.7.1ubuntu4) intrepid; urgency=low + * 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) -- cgit v1.2.3 From 01582092da5613022a4ef43751f38306957c7480 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 3 Nov 2008 12:06:05 +0100 Subject: debian/changelog: make clear that the update is specifically for jaunty --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5e4b4ff8..565f5567 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ python-apt (0.7.8~ubuntu1) jaunty; urgency=low * python/metaindex.cc - fix crash when incorrect attribute is given * data/templates/Ubuntu.info.in: - - updated + - updated for jaunty -- Michael Vogt Mon, 03 Nov 2008 11:46:54 +0100 -- cgit v1.2.3 From 4edd6ebe2bcd4a3b3fd3e7bdbcfae06d14509321 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 10 Nov 2008 11:40:11 +0100 Subject: fix changelog --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 91d69206..6e080478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ python-apt (0.7.8~ubuntu2) jaunty; urgency=low [ Michael Vogt ] - * python/metaindex.cc - - fix crash when incorrect attribute is given * data/templates/Ubuntu.info.in: - updated to fix ports.ubuntu.com for powerpc and lpia (LP: #220890) -- cgit v1.2.3 From a9edfb00b8c8d4cab6ce29608ca5ba31971c12fc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Dec 2008 14:43:42 +0100 Subject: changelog updated --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 743255a6..bb41ee35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ python-apt (0.7.8ubuntu1) jaunty; urgency=low - Merged python-apt consolidation branch by Sebastian - Heinlein (many thanks): + * Merged python-apt consolidation branch by Sebastian + Heinlein (many thanks) * apt/cache.py: - new method "isVirtualPackage()" - new method "getProvidingPackages()" -- cgit v1.2.3 From 5f1738020aca3aebd541e7c9cc9691518bf50b88 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Jan 2009 11:16:47 +0100 Subject: prepare 0.7.9~exp2ubuntu1 update --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64eedcb7..9ad0630f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.9~exp2ubuntu1) jaunty; urgency=low + + * Merged from debian, lots of documentation updates + and other fixes (thanks to Julian Andres Klode) + + -- Michael Vogt Mon, 19 Jan 2009 11:15:54 +0100 + python-apt (0.7.9~exp2) experimental; urgency=low [ Julian Andres Klode ] -- cgit v1.2.3 From 856b5f16cd50d87cc5652e8fea63e0d6b85d5118 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 21 Jan 2009 21:45:10 +0100 Subject: fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9ad0630f..a685cfdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ python-apt (0.7.9~exp2ubuntu1) jaunty; urgency=low * Merged from debian, lots of documentation updates and other fixes (thanks to Julian Andres Klode) - -- Michael Vogt Mon, 19 Jan 2009 11:15:54 +0100 + -- Michael Vogt Tue, 20 Jan 2009 15:32:54 +0100 python-apt (0.7.9~exp2) experimental; urgency=low -- cgit v1.2.3 From ac9fa49848d80f166f08f8d737ad242deea7c69e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Feb 2009 09:43:55 +0100 Subject: releasing version 0.7.9~exp2ubuntu7 --- debian/changelog | 7 +------ po/python-apt.pot | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d4a0346d..a483876f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,18 +4,13 @@ python-apt (0.7.9~exp2ubuntu7) jaunty; urgency=low - add "not_automatic" flag to the origin * debian/control: - rebuild against latest apt - - -- Michael Vogt Mon, 09 Feb 2009 15:09:17 +0100 - -python-apt (0.7.9~exp2ubuntu6) jaunty; urgency=low - * apt/cache.py: - when setting a alternative rootdir, read the config from it as well (LP: #243550) * python/configuration.cc, python/apt_pkgmodule.cc: - add apt_pkg.ReadConfigDir() - -- Michael Vogt Thu, 29 Jan 2009 09:30:52 +0100 + -- Michael Vogt Mon, 09 Feb 2009 15:09:17 +0100 python-apt (0.7.9~exp2ubuntu5) jaunty; urgency=low diff --git a/po/python-apt.pot b/po/python-apt.pot index 9bcda683..a82404f0 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: 2009-01-29 09:24+0100\n" +"POT-Creation-Date: 2009-02-09 15:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From 319f06cf7e0b81f36a364c02e891cf94ea1e585f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 25 Feb 2009 17:45:44 +0100 Subject: * Rebuild for python2.6. * Call dh_pycentral with "DH_PYCENTRAL=include-links". --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a483876f..1c0c40a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.9~exp2ubuntu8) jaunty; urgency=low + + * Rebuild for python2.6. + * Call dh_pycentral with "DH_PYCENTRAL=include-links". + + -- Matthias Klose Sat, 21 Feb 2009 18:31:23 +0000 + python-apt (0.7.9~exp2ubuntu7) jaunty; urgency=low * apt/package.py: diff --git a/debian/control b/debian/control index 2c59f9ce..c5200fba 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: APT Development Team Uploaders: Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 XS-Python-Version: all -Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg, python-sphinx (>= 0.5) +Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5) XS-Original-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu diff --git a/debian/rules b/debian/rules index 90b48cda..a96e17ff 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ DEB_AUTO_CLEANUP_RCS := yes DEB_PYTHON_SYSTEM=pycentral -export DH_PYCENTRAL=nomove +export DH_PYCENTRAL=include-links DEB_PYTHON_PACKAGES_EXCLUDE=python-apt-dbg @@ -27,7 +27,7 @@ build/python-apt:: install/python-apt-dbg:: for i in $(cdbs_python_build_versions); do \ - python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \ + python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg --install-layout=deb; \ done find debian/python-apt-dbg \ ! -type d ! -name '*_d.so' | xargs rm -f -- cgit v1.2.3 From 7f4d9c450b0e715a4306397bc002aa6d0744d62d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Mar 2009 14:11:00 +0100 Subject: * aptsources/sourceslist.py: - fix bug in invalid lines detection (LP: #324614) --- aptsources/sourceslist.py | 2 +- debian/changelog | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index dc2a5d45..cb36d9df 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -144,7 +144,7 @@ class SourceEntry: return if line[0] == "#": self.disabled = True - pieces = line[1:].strip() + pieces = line[1:].strip().split() # if it looks not like a disabled deb line return if not pieces[0] in ("rpm", "rpm-src", "deb", "deb-src"): self.invalid = True diff --git a/debian/changelog b/debian/changelog index 1c0c40a3..e334fcad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -python-apt (0.7.9~exp2ubuntu8) jaunty; urgency=low +bpython-apt (0.7.9~exp2ubuntu9) jaunty; urgency=low + + * aptsources/sourceslist.py: + - fix bug in invalid lines detection (LP: #324614) + + -- Michael Vogt Thu, 19 Mar 2009 14:09:50 +0100 + +bpython-apt (0.7.9~exp2ubuntu8) jaunty; urgency=low * Rebuild for python2.6. * Call dh_pycentral with "DH_PYCENTRAL=include-links". -- cgit v1.2.3 From 1696951e777452a2b270856c48a141ed74e0bc7e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Mar 2009 14:26:26 +0100 Subject: fix typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e334fcad..0c704fe1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -bpython-apt (0.7.9~exp2ubuntu9) jaunty; urgency=low +python-apt (0.7.9~exp2ubuntu9) jaunty; urgency=low * aptsources/sourceslist.py: - fix bug in invalid lines detection (LP: #324614) -- cgit v1.2.3 From 94da5ef1e2d927649794382b38f6bd62bb1d4ae4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Mar 2009 17:25:52 +0200 Subject: * .bzr-buildpackage/default.conf: - add pre-build hook to update the mirror list from LP --- .bzr-builddeb/default.conf | 3 ++ data/templates/Ubuntu.mirrors | 68 +++++++++++++++++++++++++++++-------------- debian/changelog | 7 +++++ po/python-apt.pot | 2 +- pre-build.sh | 4 +++ 5 files changed, 61 insertions(+), 23 deletions(-) create mode 100755 pre-build.sh (limited to 'debian') diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf index 3a08d607..c39d2e3d 100644 --- a/.bzr-builddeb/default.conf +++ b/.bzr-builddeb/default.conf @@ -1,2 +1,5 @@ [BUILDDEB] native = True + +[HOOKS] +pre-build = ./pre-build.sh diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors index d1dc5032..e197a5d7 100644 --- a/data/templates/Ubuntu.mirrors +++ b/data/templates/Ubuntu.mirrors @@ -9,9 +9,7 @@ http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ http://ftp.iinet.net.au/pub/ubuntu/ http://mirror.optus.net/ubuntu/ http://mirror.aarnet.edu.au/pub/ubuntu/archive/ -http://public.planetmirror.com/pub/ubuntu/archive/ http://mirror.3fl.net.au/ubuntu/ -http://mirror.pacific.net.au/linux/ubuntu/ http://ftp.netspace.net.au/pub/ubuntu/ http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.netspace.net.au/pub/ubuntu/ @@ -29,14 +27,17 @@ http://mirrors.hitsol.net/ubuntu/ http://ubuntu.ipacct.com/ubuntu/ #LOC:BR http://mirror.globo.com/ubuntu/archive/ -http://www.las.ic.unicamp.br/pub/ubuntu/ http://ubuntu.interlegis.gov.br/ubuntu/ -http://sft.if.usp.br/ubuntu/ http://br.archive.ubuntu.com/ubuntu/ +http://espelhos.edugraf.ufsc.br/ubuntu/ +http://www.las.ic.unicamp.br/pub/ubuntu/ +http://sft.if.usp.br/ubuntu/ #LOC:BW http://bw.archive.ubuntu.com/ubuntu/ #LOC:BY http://linux.org.by/ubuntu/ +http://mirror.datacenter.by/ubuntu/ +http://ftp.byfly.by/ubuntu/ #LOC:CA http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ @@ -47,6 +48,7 @@ http://ubuntu.mirror.rafal.ca/ubuntu/ http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/packages/ #LOC:CH http://mirror.switch.ch/ftp/mirror/ubuntu/ +http://mirror.powermongo.org/ubuntu/ #LOC:CL http://mirror.gnucv.cl/ubuntu/ http://cl.archive.ubuntu.com/ubuntu/ @@ -56,6 +58,9 @@ http://mirrors.shlug.org/ubuntu/ http://ubuntu.dormforce.net/ubuntu/ http://mirror.lupaworld.com/ubuntu/ http://mirror.rootguide.org/ubuntu/ +http://ubuntu.cn99.com/ubuntu/ +#LOC:CO +http://matematicas.unal.edu.co/ubuntu/ #LOC:CR http://ftp.ucr.ac.cr/ubuntu/ #LOC:CY @@ -70,7 +75,8 @@ http://ftp.cvut.cz/ubuntu/ http://ubuntu.sh.cvut.cz/ #LOC:DE ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu -http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ +http://ftp.uni-bayreuth.de/linux/ubuntu/ubuntu/ +http://ftp.tu-ilmenau.de/mirror/ubuntu/ http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/ @@ -80,15 +86,18 @@ ftp://ftp.fu-berlin.de/linux/ubuntu/ http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ http://ubuntu.intergenia.de/ubuntu/ +http://mirror.netcologne.de/ubuntu/ http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ -http://ftp.cw.net/ubuntu/ +http://debian.charite.de/ubuntu/ http://ftp.stw-bonn.de/ubuntu/ http://ftp.uni-kl.de/pub/linux/ubuntu/ ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ -http://ftp-stud.hs-esslingen.de/ubuntu/ http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/ +http://ftp-stud.hs-esslingen.de/ubuntu/ +http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ #LOC:DK http://dk.archive.ubuntu.com/ubuntu/ +http://mirrors.dotsrc.org/ubuntu/ http://mirror.uni-c.dk/ubuntu/ http://ftp.klid.dk/ftp/ubuntu/ #LOC:EE @@ -125,6 +134,7 @@ http://ubuntu.virginmedia.com/archive/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ http://ubuntu.positive-internet.com/ubuntu/ http://ubuntu.retrosnub.co.uk/ +http://mirror.sov.uk.goscomb.net/ubuntu/ http://archive.ubuntu.com/ubuntu/ http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ #LOC:GE @@ -143,10 +153,14 @@ http://hr.archive.ubuntu.com/ubuntu/ http://ftp.kfki.hu/linux/ubuntu/ http://ftp.freepark.org/ubuntu/ #LOC:ID +http://mirror.unej.ac.id/ubuntu/ +http://kambing.ui.ac.id/ubuntu/ http://kebo.vlsm.org/ubuntu/ http://dl2.foss-id.web.id/ubuntu/ -http://ubuntu.indika.net.id/ubuntu/ http://ubuntu.indika.net.id/ +http://ubuntu.indika.net.id/ubuntu/ +http://repo.undip.ac.id/ubuntu/ +http://ubuntu.pesat.net.id/archive/ #LOC:IE http://ftp.heanet.ie/pub/ubuntu/ http://ftp.esat.net/mirrors/archive.ubuntu.com/ @@ -172,13 +186,17 @@ http://ftp.riken.jp/Linux/ubuntu/ http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/ http://ftp.jaist.ac.jp/pub/Linux/ubuntu/ http://ubuntu.mithril-linux.org/archives/ +#LOC:KG +http://ubuntu.mega.kg/ubuntu/ #LOC:KR http://ftp.daum.net/ubuntu/ -http://mirror.korea.ac.kr/ubuntu/ +http://mirror.khlug.org/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ +http://mirror.korea.ac.kr/ubuntu/ #LOC:LT http://ftp.litnet.lt/pub/ubuntu/ #LOC:LV +http://ubuntu.load.lv/ubuntu/ http://ftp.linux.edu.lv/ubuntu/ #LOC:MN http://archive.ubuntu.mnosi.org/ubuntu/ @@ -209,6 +227,7 @@ http://ftp.uninett.no/ubuntu/ http://archive.mitra.net.np/ubuntu/ #LOC:NZ http://nz2.archive.ubuntu.com/ubuntu/ +http://mirror.ihug.co.nz/ubuntu/ http://nz.archive.ubuntu.com/ubuntu/ #LOC:PF http://pf.archive.ubuntu.com/ubuntu/ @@ -219,26 +238,25 @@ ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/ http://ubuntu.task.gda.pl/ubuntu/ http://piotrkosoft.net/pub/mirrors/ubuntu/ #LOC:PT -http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/ -http://darkstar.ist.utl.pt/ubuntu/archive/ -http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ -http://neacm.fe.up.pt/ubuntu/ http://mirrors.nfsi.pt/ubuntu/ http://ubuntu.dcc.fc.up.pt/ +http://neacm.fe.up.pt/ubuntu/ +http://darkstar.ist.utl.pt/ubuntu/archive/ +http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ #LOC:QA http://ubuntu.qatar.cmu.edu/ubuntu/ #LOC:RO http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ http://mirror.arlug.ro/pub/ubuntu/ubuntu/ -http://mirrors.xservers.ro/ubuntu/ http://ftp.lug.ro/ubuntu/ #LOC:RS -http://rs.archive.ubuntu.com/ubuntu/ +http://ubuntu.etf.bg.ac.rs/ubuntu/ #LOC:RU ftp://ftp.mipt.ru/mirror/ubuntu/ http://ftp.chg.ru/pub/Linux/ubuntu/archive/ http://mirror.yandex.ru/ubuntu/ ftp://ftp.corbina.net/pub/Linux/ubuntu/ +http://89.148.222.236/ubuntu/ http://ftp.mtu.ru/pub/ubuntu/archive/ http://mirror.rol.ru/ubuntu/ #LOC:SA @@ -247,6 +265,7 @@ http://ubuntu.mirrors.isu.net.sa/ubuntu/ http://ftp.port80.se/ubuntu/ http://mirrors.se.eu.kernel.org/ubuntu/ http://se.archive.ubuntu.com/ubuntu/ +http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/ http://ftp.ds.karen.hj.se/ubuntu/ http://ftp.sunet.se/pub/Linux/distributions/ubuntu/ubuntu/ http://ftp.df.lth.se/ubuntu/ @@ -254,11 +273,13 @@ http://ubuntu.mirror.su.se/ubuntu/ #LOC:SG http://ubuntu.oss.eznetsols.org/ubuntu/ http://ftp.science.nus.edu.sg/ubuntu/ +http://ntuoss1.uni.cx/ubuntu/ #LOC:SK http://ftp.energotel.sk/pub/linux/ubuntu/ http://ubuntu.ynet.sk/ubuntu/ http://ftp.antik.sk/ubuntu/ #LOC:TH +http://mirror.in.th/osarchive/ubuntu/ http://ubuntu-archive.sit.kmutt.ac.th/ http://mirror1.ku.ac.th/ubuntu/ http://th.archive.ubuntu.com/ubuntu/ @@ -270,13 +291,14 @@ http://russell.cs.bilgi.edu.tr/ubuntu/ http://ftp.metu.edu.tr/ubuntu/ #LOC:TW ftp://ftp.chu.edu.tw/Linux/Ubuntu/archives/ -http://ubuntu.csie.nctu.edu.tw/ubuntu/ http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/ http://tw.archive.ubuntu.com/ubuntu/ -http://ftp.twaren.net/Linux/Ubuntu/ubuntu/ +http://mirror.nttu.edu.tw/ubuntu/ +http://ftp.tcc.edu.tw/Linux/ubuntu/ +http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ftp.nchu.edu.tw/Linux/Ubuntu/ http://debian.nctu.edu.tw/ubuntu/ -http://mirror.nttu.edu.tw/ubuntu/ +http://ftp.twaren.net/Linux/Ubuntu/ubuntu/ http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/ http://ubuntu.stu.edu.tw/ubuntu/ http://free.nchc.org.tw/ubuntu/ @@ -290,11 +312,10 @@ http://mirror.math.ucdavis.edu/ubuntu/ http://mirror.umoss.org/ubuntu/ http://ubuntu.media.mit.edu/ubuntu/ http://mirrors.cs.wmich.edu/ubuntu/ -http://mirror.imbrandon.com/ubuntu/ -http://ftp.unina.it/pub/linux/distributions/ubuntu/ +http://mirrors.login.com/ubuntu/ http://ubuntu.cs.utah.edu/ubuntu/ http://mirrors.rit.edu/ubuntu/ -http://mirror.clarkson.edu/pub/ubuntu/ +http://mirrors.cat.pdx.edu/ubuntu/ http://ubuntu-mirror.cs.colorado.edu/ubuntu/ http://ubuntu.mirror.frontiernet.net/ubuntu/ http://mirror.uoregon.edu/ubuntu/archives/ @@ -305,7 +326,8 @@ http://ftp.utexas.edu/ubuntu/ http://www.gtlib.gatech.edu/pub/ubuntu/ http://mirror.its.uidaho.edu/pub/ubuntu/ http://archive.linux.duke.edu/ubuntu/ -http://cudlug.cudenver.edu/ubuntu/ +http://mirror.clarkson.edu/pub/ubuntu/ +http://ftp.unina.it/pub/linux/distributions/ubuntu/ http://ubuntu.secsup.org/ http://mirrors.easynews.com/linux/ubuntu/ http://ubuntu.osuosl.org/ubuntu/ @@ -314,6 +336,7 @@ http://mirror.cps.cmich.edu/ubuntu/ http://astromirror.uchicago.edu/ubuntu/ http://ubuntu.cs.uaf.edu/ubuntu/ http://mirror.anl.gov/pub/ubuntu/ +http://mirrors.cavecreek.net/ubuntu/ http://mirrors.xmission.com/ubuntu/ http://mirror.lcsee.wvu.edu/ubuntu/ http://mirrors.acm.jhu.edu/ubuntu/ @@ -327,5 +350,6 @@ http://ubuntu.uz/ubuntu/ #LOC:VN http://mirror-fpt-telecom.fpt.net/ubuntu/ #LOC:ZA +http://ubuntu.saix.net/ubuntu-archive/ http://ftp.leg.uct.ac.za/pub/linux/ubuntu/ http://ubuntu.mirror.ac.za/ubuntu-archive/ diff --git a/debian/changelog b/debian/changelog index 0c704fe1..06da4456 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.9~exp2ubuntu10) jaunty; urgency=low + + * .bzr-buildpackage/default.conf: + - add pre-build hook to update the mirror list from LP + + -- Michael Vogt Mon, 30 Mar 2009 17:22:38 +0200 + python-apt (0.7.9~exp2ubuntu9) jaunty; urgency=low * aptsources/sourceslist.py: diff --git a/po/python-apt.pot b/po/python-apt.pot index a82404f0..378c30da 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: 2009-02-09 15:56+0100\n" +"POT-Creation-Date: 2009-03-20 16:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/pre-build.sh b/pre-build.sh new file mode 100755 index 00000000..0b51a84c --- /dev/null +++ b/pre-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "updating mirror list from launchpad" +utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors -- cgit v1.2.3 From bb13dd4c791468172047680daf7d90a78401cbeb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 Apr 2009 16:51:34 +0200 Subject: * Build for python2.4 as well. LP: #354812. * setup.py: - only use sphinx for python2.5 or later --- debian/changelog | 11 +++++++++++ debian/control | 4 ++-- setup.py | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 06da4456..e0c03f5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +python-apt (0.7.9~exp2ubuntu11) jaunty; urgency=low + + [ Matthias Klose ] + * Build for python2.4 as well. LP: #354812. + + [ Michael vogt ] + * setup.py: + - only use sphinx for python2.5 or later + + -- Michael Vogt Thu, 16 Apr 2009 16:50:38 +0200 + python-apt (0.7.9~exp2ubuntu10) jaunty; urgency=low * .bzr-buildpackage/default.conf: diff --git a/debian/control b/debian/control index c5200fba..abae4b5b 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 -XS-Python-Version: all -Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5) +XS-Python-Version: 2.4, all +Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5), python2.4-dev, python2.4-dbg XS-Original-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu diff --git a/setup.py b/setup.py index 6a22734d..1783d4cc 100755 --- a/setup.py +++ b/setup.py @@ -61,7 +61,8 @@ setup(name="python-apt", license = 'GNU GPL', platforms = 'posix') -if len(sys.argv) > 1 and sys.argv[1] == "build": +if (len(sys.argv) > 1 and sys.argv[1] == "build" and + sys.version_info[0] >= 2 and sys.version_info[1] >= 5): import sphinx sphinx.main(["sphinx", "-b", "html", "-d", "build/doc/doctrees", os.path.abspath("doc/source"), "build/doc/html"]) -- cgit v1.2.3 From b69d3a16f24ff0238dfe98f15ed4304d5276daf7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Apr 2009 11:49:31 +0200 Subject: * data/templates/Ubuntu.info.in: - updated for karmic --- data/templates/Ubuntu.info.in | 61 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 4 ++- 2 files changed, 64 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 0adb8e67..a8993d8a 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,66 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: karmic +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com +BaseURI-lpia: http://ports.ubuntu.com/ +MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +_Description: Ubuntu 9.10 'Karmic Koala' +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: karmic +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*9.10 +MatchURI: cdrom:\[Ubuntu.*9.10 +_Description: Cdrom with Ubuntu 9.10 'Karmic Koala' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: karmic-security +ParentSuite: karmic +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com/ubuntu +BaseURI-lpia: http://ports.ubuntu.com/ +MatchURI-lpia: ports.ubuntu.com/ubuntu +_Description: Important security updates + +Suite: karmic-updates +ParentSuite: karmic +RepositoryType: deb +_Description: Recommended updates + +Suite: karmic-proposed +ParentSuite: karmic +RepositoryType: deb +_Description: Pre-released updates + +Suite: karmic-backports +ParentSuite: karmic +RepositoryType: deb +_Description: Unsupported updates + Suite: jaunty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ diff --git a/debian/changelog b/debian/changelog index e0c03f5d..17bf2d88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.9~exp2ubuntu11) jaunty; urgency=low +python-apt (0.7.9~exp2ubuntu11) karmic; urgency=low [ Matthias Klose ] * Build for python2.4 as well. LP: #354812. @@ -6,6 +6,8 @@ python-apt (0.7.9~exp2ubuntu11) jaunty; urgency=low [ Michael vogt ] * setup.py: - only use sphinx for python2.5 or later + * data/templates/Ubuntu.info.in: + - updated for karmic -- Michael Vogt Thu, 16 Apr 2009 16:50:38 +0200 -- cgit v1.2.3 From d9096e08b64c0e917bcfcce29f498fa47a6d7db4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 May 2009 14:29:13 +0200 Subject: releasing version 0.7.9~exp2ubuntu11 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 17bf2d88..a0fc52b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ python-apt (0.7.9~exp2ubuntu11) karmic; urgency=low * data/templates/Ubuntu.info.in: - updated for karmic - -- Michael Vogt Thu, 16 Apr 2009 16:50:38 +0200 + -- Michael Vogt Wed, 06 May 2009 14:28:56 +0200 python-apt (0.7.9~exp2ubuntu10) jaunty; urgency=low -- cgit v1.2.3 From e930d041559efeeee418f2242333c806a9d132c3 Mon Sep 17 00:00:00 2001 From: Michael Casadevall Date: Tue, 12 May 2009 05:53:03 -0400 Subject: * setup.py: - Added gcc and gcc_s to work around gcc-4.4 issue on ARM and libstdc++ - This is a temporary workaround for Karmic Alpha 1. See bug #375334 for more details --- debian/changelog | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 94b5f37e..d1811bfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical + + * setup.py: + - Added gcc and gcc_s to work around gcc-4.4 issue on ARM and libstdc++ + - This is a temporary workaround for Karmic Alpha 1. See bug #375334 + for more details + + -- Michael Casadevall Tue, 12 May 2009 04:49:49 -0400 + python-apt (0.7.10.3ubuntu1) karmic; urgency=low * merged from debian, remaining changes: diff --git a/setup.py b/setup.py index 9ed21378..4683554c 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ from DistUtilsExtra.command import build_extra, build_i18n # The apt_pkg module files = map(lambda source: "python/"+source, parse_makefile("python/makefile")["APT_PKG_SRC"].split()) -apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"]) +apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg", "gcc", "gcc_s"]) # The apt_inst module files = map(lambda source: "python/"+source, -- cgit v1.2.3 From b302598dfbd197fdf40d1b96c6f0155c735e7fbb Mon Sep 17 00:00:00 2001 From: Michael Casadevall Date: Tue, 12 May 2009 05:53:12 -0400 Subject: releasing version 0.7.10.3ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d1811bfd..b42956cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical +python-apt (0.7.10.3ubuntu2) karmic; urgency=critical * setup.py: - Added gcc and gcc_s to work around gcc-4.4 issue on ARM and libstdc++ - This is a temporary workaround for Karmic Alpha 1. See bug #375334 for more details - -- Michael Casadevall Tue, 12 May 2009 04:49:49 -0400 + -- Michael Casadevall Tue, 12 May 2009 05:53:07 -0400 python-apt (0.7.10.3ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 3efbb08badd17bf229c43b4ba5154029bef4fc45 Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Tue, 12 May 2009 13:24:58 +0200 Subject: Update mirror list from LP. --- data/templates/Ubuntu.mirrors | 67 ++++++++++++++++++++++++------------------- debian/changelog | 3 ++ 2 files changed, 40 insertions(+), 30 deletions(-) (limited to 'debian') diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors index e197a5d7..0084d671 100644 --- a/data/templates/Ubuntu.mirrors +++ b/data/templates/Ubuntu.mirrors @@ -9,7 +9,7 @@ http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/ http://ftp.iinet.net.au/pub/ubuntu/ http://mirror.optus.net/ubuntu/ http://mirror.aarnet.edu.au/pub/ubuntu/archive/ -http://mirror.3fl.net.au/ubuntu/ +http://mirror.pacific.net.au/linux/ubuntu/ http://ftp.netspace.net.au/pub/ubuntu/ http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.netspace.net.au/pub/ubuntu/ @@ -39,7 +39,6 @@ http://linux.org.by/ubuntu/ http://mirror.datacenter.by/ubuntu/ http://ftp.byfly.by/ubuntu/ #LOC:CA -http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/ ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/ http://gulus.usherbrooke.ca/ubuntu/ http://ubuntu.mirror.iweb.ca/ @@ -62,7 +61,7 @@ http://ubuntu.cn99.com/ubuntu/ #LOC:CO http://matematicas.unal.edu.co/ubuntu/ #LOC:CR -http://ftp.ucr.ac.cr/ubuntu/ +http://mirrors.ucr.ac.cr/ubuntu/ #LOC:CY http://mirrors.cytanet.com.cy/linux/ubuntu/archive/ #LOC:CZ @@ -75,26 +74,27 @@ http://ftp.cvut.cz/ubuntu/ http://ubuntu.sh.cvut.cz/ #LOC:DE ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu -http://ftp.uni-bayreuth.de/linux/ubuntu/ubuntu/ -http://ftp.tu-ilmenau.de/mirror/ubuntu/ -http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ -http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ -http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/ +http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/ http://de.archive.ubuntu.com/ubuntu/ -http://archive.ubuntu.uasw.edu/ ftp://ftp.fu-berlin.de/linux/ubuntu/ -http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ -http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ -http://ubuntu.intergenia.de/ubuntu/ +http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://ftp5.gwdg.de/pub/linux/debian/ubuntu/ http://debian.charite.de/ubuntu/ +http://ftp.tu-ilmenau.de/mirror/ubuntu/ +http://ubuntu.intergenia.de/ubuntu/ +http://archive.ubuntu.uasw.edu/ +ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ +http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ http://ftp.stw-bonn.de/ubuntu/ http://ftp.uni-kl.de/pub/linux/ubuntu/ -ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu/ -http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/ +http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/ +http://ftp.hosteurope.de/mirror/archive.ubuntu.com/ +http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/ +http://ftp.uni-bayreuth.de/linux/ubuntu/ubuntu/ +http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/ +http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/ http://ftp-stud.hs-esslingen.de/ubuntu/ -http://ftp.tu-chemnitz.de/pub/linux/ubuntu/ #LOC:DK http://dk.archive.ubuntu.com/ubuntu/ http://mirrors.dotsrc.org/ubuntu/ @@ -129,6 +129,7 @@ http://ubuntu-archive.mirrors.proxad.net/ubuntu/ http://ftp.crihan.fr/ubuntu/ #LOC:GB http://ubuntu-archive.datahop.it/ubuntu/ +http://mirror.as29550.net/archive.ubuntu.com/ http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/ http://ubuntu.virginmedia.com/archive/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ @@ -153,13 +154,13 @@ http://hr.archive.ubuntu.com/ubuntu/ http://ftp.kfki.hu/linux/ubuntu/ http://ftp.freepark.org/ubuntu/ #LOC:ID -http://mirror.unej.ac.id/ubuntu/ +http://repo.undip.ac.id/ubuntu/ http://kambing.ui.ac.id/ubuntu/ http://kebo.vlsm.org/ubuntu/ http://dl2.foss-id.web.id/ubuntu/ http://ubuntu.indika.net.id/ http://ubuntu.indika.net.id/ubuntu/ -http://repo.undip.ac.id/ubuntu/ +http://mirror.unej.ac.id/ubuntu/ http://ubuntu.pesat.net.id/archive/ #LOC:IE http://ftp.heanet.ie/pub/ubuntu/ @@ -193,11 +194,14 @@ http://ftp.daum.net/ubuntu/ http://mirror.khlug.org/ubuntu/ http://kr.archive.ubuntu.com/ubuntu/ http://mirror.korea.ac.kr/ubuntu/ +#LOC:KZ +http://mirror.neolabs.kz/ubuntu/ #LOC:LT +http://mirror.soften.ktu.lt/ubuntu/ http://ftp.litnet.lt/pub/ubuntu/ #LOC:LV +http://ubuntu-arch.linux.edu.lv/ubuntu/ http://ubuntu.load.lv/ubuntu/ -http://ftp.linux.edu.lv/ubuntu/ #LOC:MN http://archive.ubuntu.mnosi.org/ubuntu/ #LOC:MT @@ -205,19 +209,21 @@ http://mt.archive.ubuntu.com/ubuntu/ #LOC:MX http://tezcatl.fciencias.unam.mx/ubuntu/ #LOC:MY -http://mirror.oscc.org.my/ubuntu/ +http://www.mirror.upm.edu.my/ubuntu/ http://archive.mmu.edu.my/ubuntu/ +http://mirror.oscc.org.my/ubuntu/ +http://mirror.upm.edu.my/ubuntu/ http://ubuntu.mmu.edu.my/ubuntu/ #LOC:NA http://ubuntu-archive.polytechnic.edu.na/ubuntu/ #LOC:NL http://ubuntu.tiscali.nl/ -http://nl2.archive.ubuntu.com/ubuntu/ http://ubuntu.mirror.cambrium.nl/ubuntu/ +http://mirrors.nl.eu.kernel.org/ubuntu/ http://nl3.archive.ubuntu.com/ubuntu/ http://ftp.telfort.nl/ubuntu/ http://ftp.tudelft.nl/archive.ubuntu.com/ -http://mirrors.nl.eu.kernel.org/ubuntu/ +http://ftp.snt.utwente.nl/pub/os/linux/ubuntu-archive/ ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/ http://ubuntuarchive.eweka.nl/ubuntu/ http://nl.archive.ubuntu.com/ubuntu/ @@ -236,19 +242,22 @@ http://ftp.wcss.pl/ubuntu/ http://ftp.vectranet.pl/ubuntu/ ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/ http://ubuntu.task.gda.pl/ubuntu/ -http://piotrkosoft.net/pub/mirrors/ubuntu/ #LOC:PT -http://mirrors.nfsi.pt/ubuntu/ -http://ubuntu.dcc.fc.up.pt/ -http://neacm.fe.up.pt/ubuntu/ +http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/ +ftp://ftp.ua.pt/pub/ubuntu/ http://darkstar.ist.utl.pt/ubuntu/archive/ +http://pathfinder.ipcb.pt/ubuntu/ http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/ +http://neacm.fe.up.pt/ubuntu/ +http://mirrors.nfsi.pt/ubuntu/ +http://ubuntu.dcc.fc.up.pt/ #LOC:QA http://ubuntu.qatar.cmu.edu/ubuntu/ #LOC:RO +http://mirror.pub.ro/ubuntu/ +http://ftp.gts.lug.ro/ubuntu/ http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ http://mirror.arlug.ro/pub/ubuntu/ubuntu/ -http://ftp.lug.ro/ubuntu/ #LOC:RS http://ubuntu.etf.bg.ac.rs/ubuntu/ #LOC:RU @@ -273,7 +282,6 @@ http://ubuntu.mirror.su.se/ubuntu/ #LOC:SG http://ubuntu.oss.eznetsols.org/ubuntu/ http://ftp.science.nus.edu.sg/ubuntu/ -http://ntuoss1.uni.cx/ubuntu/ #LOC:SK http://ftp.energotel.sk/pub/linux/ubuntu/ http://ubuntu.ynet.sk/ubuntu/ @@ -305,15 +313,14 @@ http://free.nchc.org.tw/ubuntu/ http://ftp.cs.pu.edu.tw/Linux/Ubuntu/ubuntu/ #LOC:UA http://mirror.mirohost.net/ubuntu/ -http://ubuntu.org.ua/ubuntu/ #LOC:US http://ubuntu.wallawalla.edu/ubuntu/ http://mirror.math.ucdavis.edu/ubuntu/ http://mirror.umoss.org/ubuntu/ +http://ubuntu.securedservers.com/ http://ubuntu.media.mit.edu/ubuntu/ http://mirrors.cs.wmich.edu/ubuntu/ http://mirrors.login.com/ubuntu/ -http://ubuntu.cs.utah.edu/ubuntu/ http://mirrors.rit.edu/ubuntu/ http://mirrors.cat.pdx.edu/ubuntu/ http://ubuntu-mirror.cs.colorado.edu/ubuntu/ @@ -331,12 +338,12 @@ http://ftp.unina.it/pub/linux/distributions/ubuntu/ http://ubuntu.secsup.org/ http://mirrors.easynews.com/linux/ubuntu/ http://ubuntu.osuosl.org/ubuntu/ +ftp://ftp.egr.msu.edu/pub/ubuntu/archive/ http://mirrors.us.kernel.org/ubuntu/ http://mirror.cps.cmich.edu/ubuntu/ http://astromirror.uchicago.edu/ubuntu/ http://ubuntu.cs.uaf.edu/ubuntu/ http://mirror.anl.gov/pub/ubuntu/ -http://mirrors.cavecreek.net/ubuntu/ http://mirrors.xmission.com/ubuntu/ http://mirror.lcsee.wvu.edu/ubuntu/ http://mirrors.acm.jhu.edu/ubuntu/ diff --git a/debian/changelog b/debian/changelog index d6db7f70..1ac49f2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical - This is a temporary workaround for Karmic Alpha 1. See bug #375334 for more details + [ Loic Minier ] + * Update mirror list from LP. + -- Michael Casadevall Tue, 12 May 2009 05:53:07 -0400 python-apt (0.7.10.3ubuntu1) karmic; urgency=low -- cgit v1.2.3 From 9cd6725fa7ce15d8dc91aa0ceac0f2f26a4a5582 Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Tue, 12 May 2009 13:28:58 +0200 Subject: Unsset https_proxy in pre-build.sh to workaround LP #94130. --- debian/changelog | 1 + pre-build.sh | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1ac49f2b..5e0c2709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical [ Loic Minier ] * Update mirror list from LP. + * Unsset https_proxy in pre-build.sh to workaround LP #94130. -- Michael Casadevall Tue, 12 May 2009 05:53:07 -0400 diff --git a/pre-build.sh b/pre-build.sh index 0b51a84c..29effc13 100755 --- a/pre-build.sh +++ b/pre-build.sh @@ -1,4 +1,8 @@ #!/bin/sh echo "updating mirror list from launchpad" +if [ -n "$https_proxy" ]; then + echo "disabling https_proxy as Python's urllib doesn't support it; see #94130" + unset https_proxy +fi utils/get_ubuntu_mirrors_from_lp.py > data/templates/Ubuntu.mirrors -- cgit v1.2.3 From 46550d6019b867a6a21a55f5d6e4000f3b373978 Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Tue, 12 May 2009 13:29:21 +0200 Subject: Release 0.7.10.3ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5e0c2709..78e9b733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical +python-apt (0.7.10.3ubuntu2) karmic; urgency=critical [ Loic Minier ] * Merge changes below from Michael Casadevall. @@ -13,7 +13,7 @@ python-apt (0.7.10.3ubuntu2) UNRELEASED; urgency=critical * Update mirror list from LP. * Unsset https_proxy in pre-build.sh to workaround LP #94130. - -- Michael Casadevall Tue, 12 May 2009 05:53:07 -0400 + -- Loic Minier Tue, 12 May 2009 13:29:08 +0200 python-apt (0.7.10.3ubuntu1) karmic; urgency=low -- cgit v1.2.3 From dce66068099a9fe24f6d0b9c017d0ddbf2be5b3e Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Tue, 12 May 2009 13:54:08 +0200 Subject: * Note that these changes were concurrently uploaded in a different form in 0.7.10.3ubuntu2 which wasn't committed in bzr. --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 78e9b733..ca5e6188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ -python-apt (0.7.10.3ubuntu2) karmic; urgency=critical +python-apt (0.7.10.3ubuntu3) UNRELEASED; urgency=critical [ Loic Minier ] - * Merge changes below from Michael Casadevall. + * Merge changes below from Michael Casadevall; note that these changes were + concurrently uploaded in a different form in 0.7.10.3ubuntu2 which wasn't + committed in bzr. [ Michael Casadevall ] * setup.py: @@ -11,7 +13,7 @@ python-apt (0.7.10.3ubuntu2) karmic; urgency=critical [ Loic Minier ] * Update mirror list from LP. - * Unsset https_proxy in pre-build.sh to workaround LP #94130. + * Unset https_proxy in pre-build.sh to workaround LP #94130. -- Loic Minier Tue, 12 May 2009 13:29:08 +0200 -- cgit v1.2.3 From a0f7295b7cd2d64bfc1e0b7c52fa39b1132f1fe5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Jun 2009 11:04:55 +0200 Subject: * apt/cache.py: - when the cache is run with a alternative rootdir, create required dirs/files automatically * python/progress.cc: - fix crash in RunSimpleCallback() --- apt/cache.py | 25 +++++++++++++++++++++++++ debian/changelog | 5 +++++ python/progress.cc | 5 ++++- 3 files changed, 34 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt/cache.py b/apt/cache.py index cc425ccb..94a77fd8 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -60,8 +60,33 @@ class Cache(object): apt_pkg.Config.Set("Dir", rootdir) apt_pkg.Config.Set("Dir::State::status", rootdir + "/var/lib/dpkg/status") + # create required dirs/files when run with special rootdir + # automatically + self._check_and_create_required_dirs(rootdir) self.open(progress) + def _check_and_create_required_dirs(self, rootdir): + """ + check if the required apt directories/files are there and if + not create them + """ + files = ["/var/lib/dpkg/status", + "/etc/apt/sources.list", + ] + dirs = ["/var/lib/dpkg", + "/etc/apt/", + "/var/cache/apt/archives/partial", + "/var/lib/apt/lists/partial", + ] + for d in dirs: + if not os.path.exists(rootdir+d): + print "creating: ",rootdir+d + os.makedirs(rootdir+d) + for f in files: + if not os.path.exists(rootdir+f): + open(rootdir+f,"w") + + def _runCallbacks(self, name): """ internal helper to run a callback """ if name in self._callbacks: diff --git a/debian/changelog b/debian/changelog index 3bd90bed..316c83bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ python-apt (0.7.10.4ubuntu1) karmic; urgency=low [ Michael Vogt ] * merged from debian/unstable + * apt/cache.py: + - when the cache is run with a alternative rootdir, create + required dirs/files automatically + * python/progress.cc: + - fix crash in RunSimpleCallback() [ Loic Minier ] * Merge changes below from Michael Casadevall; note that these changes were diff --git a/python/progress.cc b/python/progress.cc index c5a1c138..ef114e89 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -25,9 +25,12 @@ bool PyCallbackObj::RunSimpleCallback(const char* method_name, PyObject *method = PyObject_GetAttrString(callbackInst,(char*) method_name); if(method == NULL) { - // FIXME: make this silent //std::cerr << "Can't find '" << method_name << "' method" << std::endl; Py_XDECREF(arglist); + if (res) { + Py_INCREF(Py_None); + *res = Py_None; + } return false; } PyObject *result = PyEval_CallObject(method, arglist); -- cgit v1.2.3 From 2d5c6093e0d77576da867c2e5e6f42b6b75de37b Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Mon, 29 Jun 2009 10:31:59 +0200 Subject: Revert addition of gcc and gcc_s to python-apt libs as the toolchain has been fixed; LP: #375334. --- debian/changelog | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 316c83bc..da376bc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.10.4ubuntu2) UNRELEASED; urgency=low + + * Revert addition of gcc and gcc_s to python-apt libs as the toolchain has + been fixed; LP: #375334. + + -- Loïc Minier Mon, 29 Jun 2009 10:30:58 +0200 + python-apt (0.7.10.4ubuntu1) karmic; urgency=low [ Michael Vogt ] diff --git a/setup.py b/setup.py index 4683554c..9ed21378 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ from DistUtilsExtra.command import build_extra, build_i18n # The apt_pkg module files = map(lambda source: "python/"+source, parse_makefile("python/makefile")["APT_PKG_SRC"].split()) -apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg", "gcc", "gcc_s"]) +apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"]) # The apt_inst module files = map(lambda source: "python/"+source, -- cgit v1.2.3 From 4766663eec43fb3c580bc217218ada9840f6c9d8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 20 Aug 2009 14:31:36 +0200 Subject: * apt/package.py: - fix bug in BaseDependency initialization * debian/control: - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4) --- debian/changelog | 9 +++++++++ debian/control | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6ef1fff6..4ae70ef2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.7.12.1ubuntu2) UNRELEASEDkarmic; urgency=low + + * apt/package.py: + - fix bug in BaseDependency initialization + * debian/control: + - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4) + + -- Michael Vogt Thu, 20 Aug 2009 14:23:40 +0200 + python-apt (0.7.12.1ubuntu1) karmic; urgency=low [ Michael Vogt ] diff --git a/debian/control b/debian/control index 180cc995..90e6a060 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release Recommends: iso-codes, libjs-jquery -Breaks: debdelta (<< 0.28~) +Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4) Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte XB-Python-Version: ${python:Versions} -- cgit v1.2.3 From 543bd48fbc582b2ef663cd8bcd387a11939e78b4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 20 Aug 2009 15:03:25 +0200 Subject: releasing version 0.7.12.1ubuntu2 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4ae70ef2..064ba0ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -python-apt (0.7.12.1ubuntu2) UNRELEASEDkarmic; urgency=low +python-apt (0.7.12.1ubuntu2) karmic; urgency=low * apt/package.py: - - fix bug in BaseDependency initialization + - fix bug in BaseDependency initialization (LP: #416362) * debian/control: - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4) + packagekit usees some internal API that changed -- Michael Vogt Thu, 20 Aug 2009 14:23:40 +0200 -- cgit v1.2.3 From bad4ccc67b4fb538498550ff48aef0e40bbb065c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Aug 2009 16:54:30 +0200 Subject: releasing version 0.7.13.2ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7d49c416..16efbb88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ python-apt (0.7.13.2ubuntu1) karmic; urgency=low - Make ActionGroups context managers so apt.Cache.actiongroup() has the same behavior as in 0.7.92 - -- Julian Andres Klode Mon, 24 Aug 2009 15:43:00 +0200 + -- Michael Vogt Mon, 24 Aug 2009 16:53:16 +0200 python-apt (0.7.13.2) unstable; urgency=low -- cgit v1.2.3 From 1a3e963099e6e121c8d541883fd05e2c7f5b6766 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 Sep 2009 10:46:55 +0200 Subject: releasing version 0.7.13.2ubuntu2 --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 87d7441a..da7ae66f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.13.2ubuntu2) UNRELEASEDkarmic; urgency=low +python-apt (0.7.13.2ubuntu2) karmic; urgency=low [ Michael Vogt ] * apt/cache.py: @@ -11,8 +11,7 @@ python-apt (0.7.13.2ubuntu2) UNRELEASEDkarmic; urgency=low * apt/package.py: - Export if a package is an essential one (Closes: #543428) - - -- Michael Vogt Thu, 03 Sep 2009 15:36:56 +0200 + -- Michael Vogt Fri, 04 Sep 2009 10:32:19 +0200 python-apt (0.7.13.2ubuntu1) karmic; urgency=low -- cgit v1.2.3 From c39bac0046f881dd077b5a15fcc2793da5ba8c65 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Oct 2009 19:10:15 +0100 Subject: * python/progress.cc: - if the mediaChange() does not return anything or is not implemented send "false" to libapt * * No change rebuild to fix misbuilt binaries on armel. * rebuild against latest libapt --- debian/changelog | 21 +++++++++++++++++++++ python/progress.cc | 9 ++++----- 2 files changed, 25 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da7ae66f..b1faf76f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +python-apt (0.7.13.2ubuntu5) UNRELEASED; urgency=low + + * python/progress.cc: + - if the mediaChange() does not return anything or is not implemented + send "false" to libapt + * + + -- Michael Vogt Wed, 28 Oct 2009 19:09:44 +0100 + +python-apt (0.7.13.2ubuntu4) karmic; urgency=low + + * No change rebuild to fix misbuilt binaries on armel. + + -- Loïc Minier Wed, 21 Oct 2009 14:52:36 +0200 + +python-apt (0.7.13.2ubuntu3) karmic; urgency=low + + * rebuild against latest libapt + + -- Michael Vogt Fri, 25 Sep 2009 22:17:35 +0200 + python-apt (0.7.13.2ubuntu2) karmic; urgency=low [ Michael Vogt ] diff --git a/python/progress.cc b/python/progress.cc index b3e06b87..82967687 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -104,11 +104,10 @@ bool PyFetchProgress::MediaChange(string Media, string Drive) RunSimpleCallback("mediaChange", arglist, &result); bool res = true; - if(!PyArg_Parse(result, "b", &res)) - std::cerr << "result could not be parsed" << std::endl; - - // FIXME: find out what it should return usually - //std::cerr << "res is: " << res << std::endl; + if(!PyArg_Parse(result, "b", &res)) { + // no return value or None, assume false + return false; + } PyCbObj_BEGIN_ALLOW_THREADS return res; -- cgit v1.2.3 From 60b61c2ac29fa77696b7b28e747a01dc99a01e4c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Oct 2009 19:12:09 +0100 Subject: update changelog with bugnumber --- debian/changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b1faf76f..c1669916 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,7 @@ python-apt (0.7.13.2ubuntu5) UNRELEASED; urgency=low * python/progress.cc: - if the mediaChange() does not return anything or is not implemented - send "false" to libapt - * + send "false" to libapt (LP: #462771) -- Michael Vogt Wed, 28 Oct 2009 19:09:44 +0100 -- cgit v1.2.3 From 78e5a19a66ece4150cad2edd9010e1721db4cc6d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Nov 2009 18:39:14 +0100 Subject: * data/templates/Ubuntu.info.in: - add lucid --- data/templates/Ubuntu.info.in | 61 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 6 +++-- 2 files changed, 65 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index a8993d8a..2335454f 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,66 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: lucid +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com +BaseURI-lpia: http://ports.ubuntu.com/ +MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors +MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors +_Description: Ubuntu 10.04 'Lucid Lynx' +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: lucid +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*10.04 +MatchURI: cdrom:\[Ubuntu.*10.04 +_Description: Cdrom with Ubuntu 10.04 'Lucid Lynx' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: lucid-security +ParentSuite: lucid +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com/ubuntu +BaseURI-lpia: http://ports.ubuntu.com/ +MatchURI-lpia: ports.ubuntu.com/ubuntu +_Description: Important security updates + +Suite: lucid-updates +ParentSuite: lucid +RepositoryType: deb +_Description: Recommended updates + +Suite: lucid-proposed +ParentSuite: lucid +RepositoryType: deb +_Description: Pre-released updates + +Suite: lucid-backports +ParentSuite: lucid +RepositoryType: deb +_Description: Unsupported updates + Suite: karmic RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ diff --git a/debian/changelog b/debian/changelog index c1669916..dbb91706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -python-apt (0.7.13.2ubuntu5) UNRELEASED; urgency=low +python-apt (0.7.13.2ubuntu5) lucid; urgency=low * python/progress.cc: - if the mediaChange() does not return anything or is not implemented send "false" to libapt (LP: #462771) + * data/templates/Ubuntu.info.in: + - add lucid - -- Michael Vogt Wed, 28 Oct 2009 19:09:44 +0100 + -- Michael Vogt Thu, 05 Nov 2009 18:38:36 +0100 python-apt (0.7.13.2ubuntu4) karmic; urgency=low -- cgit v1.2.3 From c69e1b0d6e7224f21026c2ec793140b99b93f8de Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 2 Dec 2009 15:14:22 +0000 Subject: * apt/progress/__init__.py: - Fix InstallProgress.updateInterface() to cope with read() returning 0 on non-blocking file descriptors (LP: #491027). --- apt/progress/__init__.py | 5 ++++- debian/changelog | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py index ca60810f..c042ece7 100644 --- a/apt/progress/__init__.py +++ b/apt/progress/__init__.py @@ -246,7 +246,10 @@ class InstallProgress(DumbInstallProgress): return try: while not self.read.endswith("\n"): - self.read += os.read(self.statusfd.fileno(), 1) + r = os.read(self.statusfd.fileno(), 1) + if not r: + return + self.read += r except OSError, (errno_, errstr): # resource temporarly unavailable is ignored if errno_ != errno.EAGAIN and errno_ != errno.EWOULDBLOCK: diff --git a/debian/changelog b/debian/changelog index dbb91706..626cb9f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.13.2ubuntu6) UNRELEASED; urgency=low + + * apt/progress/__init__.py: + - Fix InstallProgress.updateInterface() to cope with read() returning 0 + on non-blocking file descriptors (LP: #491027). + + -- Colin Watson Wed, 02 Dec 2009 13:56:58 +0000 + python-apt (0.7.13.2ubuntu5) lucid; urgency=low * python/progress.cc: -- cgit v1.2.3 From c86aad8bf2070784a95dda2cd0fb8f7aaff6860f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Jan 2010 11:17:36 +0100 Subject: releasing version 0.7.13.4ubuntu1 --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8145d30b..21ac9377 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ -python-apt (0.7.13.4ubuntu1) UNRELEASED; urgency=low +python-apt (0.7.13.4ubuntu1) lucid; urgency=low + [ Michael Vogt ] * merge from debian, remaining changes: - different mirror list + + [ Colin Watson ] * apt/progress/__init__.py: - Fix InstallProgress.updateInterface() to cope with read() returning 0 on non-blocking file descriptors (LP: #491027). - -- Colin Watson Wed, 02 Dec 2009 13:56:58 +0000 + -- Michael Vogt Wed, 02 Dec 2009 17:02:37 +0100 python-apt (0.7.13.4) unstable; urgency=low -- cgit v1.2.3 From 0daf14cfd41a43a94c799f6a74bab07068cb3e19 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 22 Jan 2010 12:23:15 +0100 Subject: releasing version 0.7.13.4ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index db77244c..04dcb56e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-apt (0.7.13.4ubuntu3) UNRELEASED; urgency=low +python-apt (0.7.13.4ubuntu3) lucid; urgency=low * apt/utils.py: - add some misc utils like get_release_filename_for_pkg() - -- Michael Vogt Wed, 20 Jan 2010 17:36:31 +0100 + -- Michael Vogt Fri, 22 Jan 2010 12:18:29 +0100 python-apt (0.7.13.4ubuntu2) lucid; urgency=low -- cgit v1.2.3 From 149e7147fe8b3a1c0017a9429a8f0855f32b4984 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 4 Feb 2010 11:14:17 -0800 Subject: Drop build dependency on python2.4. --- debian/changelog | 6 ++++++ debian/control | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 04dcb56e..81ba0c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-apt (0.7.13.4ubuntu4) lucid; urgency=low + + * Drop build dependency on python2.4. + + -- Matthias Klose Mon, 01 Feb 2010 20:30:14 +0100 + python-apt (0.7.13.4ubuntu3) lucid; urgency=low * apt/utils.py: diff --git a/debian/control b/debian/control index 44554ad7..1bd55d2a 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,6 @@ Build-Depends: apt-utils, libapt-pkg-dev (>= 0.7.21), python-all-dbg, python-all-dev, - python2.4-dev, - python2.4-dbg, python-central (>= 0.5), python-debian, python-distutils-extra (>= 1.9.0), -- cgit v1.2.3 From adfdabb1dbd111bd758e305883e03b6a58a68904 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 4 Mar 2010 13:14:07 +0100 Subject: * data/templates/Ubuntu.info.in: - make armel point to ports.ubuntu.com (LP: #531876) --- data/templates/Ubuntu.info.in | 12 ++++++++++++ debian/changelog | 7 +++++++ 2 files changed, 19 insertions(+) (limited to 'debian') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 2335454f..ad1df0fe 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -8,6 +8,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +BaseURI-armel: http://ports.ubuntu.com/ +MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' @@ -44,6 +46,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com/ubuntu BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com/ubuntu +BaseURI-armel: http://ports.ubuntu.com/ +MatchURI-armel: ports.ubuntu.com/ubuntu _Description: Important security updates Suite: lucid-updates @@ -69,6 +73,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +BaseURI-armel: http://ports.ubuntu.com/ +MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 9.10 'Karmic Koala' @@ -105,6 +111,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com/ubuntu BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com/ubuntu +BaseURI-armel: http://ports.ubuntu.com/ +MatchURI-armel: ports.ubuntu.com/ubuntu _Description: Important security updates Suite: karmic-updates @@ -130,6 +138,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +BaseURI-armel: http://ports.ubuntu.com/ +MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 9.04 'Jaunty Jackalope' @@ -166,6 +176,8 @@ BaseURI-powerpc: http://ports.ubuntu.com/ MatchURI-powerpc: ports.ubuntu.com/ubuntu BaseURI-lpia: http://ports.ubuntu.com/ MatchURI-lpia: ports.ubuntu.com/ubuntu +BaseURI-armel: http://ports.ubuntu.com/ +MatchURI-armel: ports.ubuntu.com/ubuntu _Description: Important security updates Suite: jaunty-updates diff --git a/debian/changelog b/debian/changelog index 81ba0c6d..b9de3814 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.13.4ubuntu5) ludic; urgency=low + + * data/templates/Ubuntu.info.in: + - make armel point to ports.ubuntu.com (LP: #531876) + + -- Michael Vogt Thu, 04 Mar 2010 13:12:39 +0100 + python-apt (0.7.13.4ubuntu4) lucid; urgency=low * Drop build dependency on python2.4. -- cgit v1.2.3 From 638ac28c58ad5e92ddd9a58c569c536ad6c9ccbe Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Thu, 4 Mar 2010 23:46:46 +0900 Subject: fix upload target --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b9de3814..922b45ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.13.4ubuntu5) ludic; urgency=low +python-apt (0.7.13.4ubuntu5) lucid; urgency=low * data/templates/Ubuntu.info.in: - make armel point to ports.ubuntu.com (LP: #531876) -- cgit v1.2.3 From b37120012e48ddedfa275906a60f983a6687c987 Mon Sep 17 00:00:00 2001 From: Emmet Hikory Date: Fri, 5 Mar 2010 11:18:54 +0900 Subject: * data/templates/Ubuntu.info.in: - refactor to use ports by default for gutsy and newer releases - Set appropriate exceptions to defaults for warty-lucid --- data/templates/Ubuntu.info.in | 202 ++++++++++++++++++++++++++---------------- debian/changelog | 8 +- 2 files changed, 135 insertions(+), 75 deletions(-) (limited to 'debian') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index ad1df0fe..b188a7b4 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -2,14 +2,12 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: lucid RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -BaseURI-armel: http://ports.ubuntu.com/ -MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' @@ -40,14 +38,12 @@ _CompDescription: Restricted copyright Suite: lucid-security ParentSuite: lucid RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com/ubuntu -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com/ubuntu -BaseURI-armel: http://ports.ubuntu.com/ -MatchURI-armel: ports.ubuntu.com/ubuntu +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates Suite: lucid-updates @@ -67,14 +63,12 @@ _Description: Unsupported updates Suite: karmic RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -BaseURI-armel: http://ports.ubuntu.com/ -MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: 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.10 'Karmic Koala' @@ -105,14 +99,12 @@ _CompDescription: Restricted copyright Suite: karmic-security ParentSuite: karmic RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com/ubuntu -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com/ubuntu -BaseURI-armel: http://ports.ubuntu.com/ -MatchURI-armel: ports.ubuntu.com/ubuntu +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates Suite: karmic-updates @@ -132,14 +124,12 @@ _Description: Unsupported updates Suite: jaunty RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com -BaseURI-armel: http://ports.ubuntu.com/ -MatchURI-armel: ports.ubuntu.com|archive.ubuntu.com +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: 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' @@ -170,14 +160,12 @@ _CompDescription: Restricted copyright Suite: jaunty-security ParentSuite: jaunty RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com/ubuntu -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com/ubuntu -BaseURI-armel: http://ports.ubuntu.com/ -MatchURI-armel: ports.ubuntu.com/ubuntu +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates Suite: jaunty-updates @@ -197,12 +185,12 @@ _Description: Unsupported updates Suite: intrepid RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' @@ -233,12 +221,12 @@ _CompDescription: Restricted copyright Suite: intrepid-security ParentSuite: intrepid RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com/ubuntu -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com/ubuntu +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates Suite: intrepid-updates @@ -259,12 +247,12 @@ _Description: Unsupported updates Suite: hardy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com -BaseURI-lpia: http://ports.ubuntu.com/ -MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com +BaseURI: http://ports.ubuntu.com/ubuntu-ports +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu MirrorsFile-amd64: /usr/share/python-apt/templates/Ubuntu.mirrors MirrorsFile-i386: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' @@ -295,10 +283,12 @@ _CompDescription: Restricted copyright Suite: hardy-security ParentSuite: hardy RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com -BaseURI-powerpc: http://ports.ubuntu.com/ -MatchURI-powerpc: ports.ubuntu.com/ubuntu +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates Suite: hardy-updates @@ -319,8 +309,14 @@ _Description: Unsupported updates Suite: gutsy RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu +BaseURI-sparc: http://archive.ubuntu.com/ubuntu/ +MatchURI-sparc: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 7.10 'Gutsy Gibbon' Component: main @@ -350,8 +346,14 @@ _CompDescription: Restricted copyright Suite: gutsy-security ParentSuite: gutsy RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI: http://ports.ubuntu.com/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-sparc: http://security.ubuntu.com/ubuntu/ +MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates Suite: gutsy-updates @@ -374,6 +376,12 @@ Suite: feisty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com/ubuntu-ports MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 7.04 'Feisty Fawn' Component: main @@ -405,6 +413,12 @@ ParentSuite: feisty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports +BaseURI-powerpc: http://ports.ubuntu.com/ +MatchURI-powerpc: ports.ubuntu.com/ubuntu-ports _Description: Important security updates Suite: feisty-updates @@ -426,6 +440,10 @@ Suite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 6.10 'Edgy Eft' Component: main @@ -457,6 +475,10 @@ ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Important security updates Suite: edgy-updates @@ -478,6 +500,10 @@ Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main @@ -509,6 +535,10 @@ ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Important security updates Suite: dapper-updates @@ -531,6 +561,10 @@ RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Ubuntu 5.10 'Breezy Badger' Component: main _CompDescription: Officially supported @@ -557,6 +591,10 @@ ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Ubuntu 5.10 Security Updates Suite: breezy-updates @@ -573,6 +611,10 @@ Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports MirrorsFile: /usr/share/python-apt/templates/Ubuntu.mirrors _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main @@ -600,6 +642,10 @@ ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Ubuntu 5.04 Security Updates Suite: hoary-updates @@ -616,6 +662,10 @@ Suite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Ubuntu 4.10 'Warty Warthog' Component: main _CompDescription: No longer officially supported @@ -642,6 +692,10 @@ ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-ia64: http://ports.ubuntu.com/ +MatchURI-ia64: ports.ubuntu.com/ubuntu-ports +BaseURI-hppa: http://ports.ubuntu.com/ +MatchURI-hppa: ports.ubuntu.com/ubuntu-ports _Description: Ubuntu 4.10 Security Updates Suite: warty-updates diff --git a/debian/changelog b/debian/changelog index 922b45ae..38aba67f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ python-apt (0.7.13.4ubuntu5) lucid; urgency=low + [ Michael Vogt ] * data/templates/Ubuntu.info.in: - make armel point to ports.ubuntu.com (LP: #531876) - -- Michael Vogt Thu, 04 Mar 2010 13:12:39 +0100 + [ Emmet Hikory ] + * data/templates/Ubuntu.info.in: + - refactor to use ports by default for gutsy and newer releases + - Set appropriate exceptions to defaults for warty-lucid + + -- Emmet Hikory Fri, 05 Mar 2010 10:22:05 +0900 python-apt (0.7.13.4ubuntu4) lucid; urgency=low -- cgit v1.2.3 From 73eff261f0c50609b3cee3ff099b1891d4c909f3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Mar 2010 15:39:37 +0100 Subject: debian/changelog: updated to prepare for the release --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c0ebeded..a6140c22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -python-apt (0.7.94.3) UNRELEASED; urgency=low +python-apt (0.7.94.2ubuntu1) UNRELEASED; urgency=low + Updated to the 0.7.9x series (FFe LP: #531518) + [ Julian Andres Klode ] * python/generic.cc: - Fix a memory leak when using old attribute names. @@ -16,7 +18,7 @@ python-apt (0.7.94.3) UNRELEASED; urgency=low * tests/test_apt_cache.py: - add simple test for basic cache/dependency iteration - -- Julian Andres Klode Mon, 15 Mar 2010 17:04:49 +0100 + -- Michael Vogt Tue, 23 Mar 2010 15:36:59 +0100 python-apt (0.7.94.2) unstable; urgency=low -- cgit v1.2.3 From ebe8d4f966ed1ac8f51f6372865f9a65a2fcb88b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Mar 2010 20:06:41 +0100 Subject: releasing version 0.7.94.2ubuntu1 --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 724a59de..192e3c4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -python-apt (0.7.94.2ubuntu1) UNRELEASED; urgency=low +python-apt (0.7.94.2ubuntu1) lucid; urgency=low - Updated to the 0.7.9x series (FFe LP: #531518) + Updated to the 0.7.9x series (FFe LP: #531518), this + brings us python3 support and a more PEP08 conform + API [ Julian Andres Klode ] * python/generic.cc: @@ -23,7 +25,7 @@ python-apt (0.7.94.2ubuntu1) UNRELEASED; urgency=low not feasible to port all apps in the lucid timeframe. Once lucid is released we turn the warnings on by default again - -- Michael Vogt Tue, 23 Mar 2010 15:36:59 +0100 + -- Michael Vogt Tue, 23 Mar 2010 20:01:22 +0100 python-apt (0.7.94.2) unstable; urgency=low -- cgit v1.2.3 From 4f1a8ff1fcd780c2d42dbc59f41ca38581e6f10c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 25 Mar 2010 10:44:51 +0100 Subject: commit prefix upload changes --- debian/changelog | 12 ++++++++++-- debian/control | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7114e32a..747fea77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ -python-apt (0.7.94.2ubuntu2) lucid; urgency=low +python-apt (0.7.94.2ubuntu3) lucid; urgency=low * python/indexfile.cc: - add missing 0.7 compat indexfile.ArchiveURI method (LP: #545848) - -- Michael Vogt Tue, 23 Mar 2010 16:03:50 +0100 + -- Michael Vogt Thu, 25 Mar 2010 10:44:31 +0100 + +python-apt (0.7.94.2ubuntu2) lucid; urgency=low + + * debian/control: + - build against "XS-Python-Versions: all" to ensure we only + build/test against supported python versions (fixes FTBFS) + + -- Michael Vogt Tue, 23 Mar 2010 21:24:46 +0100 python-apt (0.7.94.2ubuntu1) lucid; urgency=low diff --git a/debian/control b/debian/control index e2cb1d29..b553dee7 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Julian Andres Klode Standards-Version: 3.8.4 -XS-Python-Version: 2.6, 3.1 +XS-Python-Version: all Build-Depends: apt-utils, debhelper (>= 7.3.5), libapt-pkg-dev (>= 0.7.22~), -- cgit v1.2.3 From 4b74ecd4df220fcb9939445a9774bbcf6ba3212e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 29 Mar 2010 13:20:52 +0200 Subject: If PYTHON_APT_DEPRECATION_WARNINGS is unset, also disable the deprecation warnings in apt_pkg directly; and don't just disable any deprecation warning in apt/__init__.py (LP: #548623) --- apt/__init__.py | 5 ----- apt/deprecation.py | 13 +++++++++---- apt/package.py | 2 +- apt/progress/old.py | 25 +++++++++++++++---------- debian/changelog | 8 ++++++++ python/acquire-item.cc | 7 ++++--- python/acquire.cc | 5 +++-- python/apt_pkgmodule.cc | 5 +++-- python/cache.cc | 17 ++++++++++------- python/cdrom.cc | 12 +++++++----- python/depcache.cc | 19 +++++++++++-------- python/generic.cc | 3 ++- python/generic.h | 1 + python/pkgmanager.cc | 7 ++++--- python/pkgrecords.cc | 7 ++++--- python/pkgsrcrecords.cc | 7 ++++--- python/sourcelist.cc | 7 ++++--- python/tag.cc | 14 ++++++++------ tests/old/memleak.py | 0 19 files changed, 98 insertions(+), 66 deletions(-) mode change 100755 => 100644 tests/old/memleak.py (limited to 'debian') diff --git a/apt/__init__.py b/apt/__init__.py index 8b66ad13..a8a8b8fc 100644 --- a/apt/__init__.py +++ b/apt/__init__.py @@ -17,11 +17,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -import os -import warnings -if not "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.simplefilter('ignore', DeprecationWarning) - # import the core of apt_pkg """High-Level Interface for working with apt.""" import apt_pkg diff --git a/apt/deprecation.py b/apt/deprecation.py index 0f39ad63..cd33a51b 100644 --- a/apt/deprecation.py +++ b/apt/deprecation.py @@ -24,6 +24,7 @@ not use it for anything outside the apt package. """ import re import operator +import os import warnings import apt_pkg @@ -49,12 +50,14 @@ class AttributeDeprecatedBy(object): """Issue a DeprecationWarning and return the requested value.""" if obj is None: return getattr(type_, self.attribute, self) - warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) return self.getter(obj or type_) def __set__(self, obj, value): """Issue a DeprecationWarning and set the requested value.""" - warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) setattr(obj, self.attribute, value) @@ -71,7 +74,8 @@ def function_deprecated_by(func, convert_names=True): def deprecated_function(*args, **kwds): """Wrapper around a deprecated function.""" - warnings.warn(warning, DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn(warning, DeprecationWarning, stacklevel=2) if convert_names: for key in kwds.keys(): kwds[re.sub('([A-Z])', '_\\1', key).lower()] = kwds.pop(key) @@ -93,7 +97,8 @@ def deprecated_args(func): for key in kwds.keys(): new_key = re.sub('([A-Z])', '_\\1', key).lower() if new_key != key: - warnings.warn("Deprecated parameter %r" % key) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn("Deprecated parameter %r" % key) kwds[new_key] = kwds.pop(key) return func(*args, **kwds) diff --git a/apt/package.py b/apt/package.py index 0c026504..701872a8 100644 --- a/apt/package.py +++ b/apt/package.py @@ -120,7 +120,7 @@ class DeprecatedProperty(property): self.__doc__ = (doc or fget.__doc__ or '') def __get__(self, obj, type_=None): - if obj is not None: + if obj is not None and "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: warnings.warn("Accessed deprecated property %s.%s, please see the " "Version class for alternatives." % ((obj.__class__.__name__ or type_.__name__), diff --git a/apt/progress/old.py b/apt/progress/old.py index 4bd79f2e..2d3fdb59 100644 --- a/apt/progress/old.py +++ b/apt/progress/old.py @@ -42,8 +42,9 @@ class OpProgress(base.OpProgress): def __init__(self): base.OpProgress.__init__(self) - warnings.warn("apt.progress.OpProgress is deprecated.", - DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn("apt.progress.OpProgress is deprecated.", + DeprecationWarning, stacklevel=2) subOp = AttributeDeprecatedBy('subop') Op = AttributeDeprecatedBy('op') @@ -54,8 +55,9 @@ class OpTextProgress(OpProgress, text.OpProgress): def __init__(self): text.OpProgress.__init__(self) - warnings.warn("apt.progress.OpTextProgress is deprecated.", - DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn("apt.progress.OpTextProgress is deprecated.", + DeprecationWarning, stacklevel=2) class FetchProgress(object): @@ -75,8 +77,9 @@ class FetchProgress(object): self.totalBytes = 0 self.totalItems = 0 self.currentCPS = 0 - warnings.warn("apt.progress.FetchProgress is deprecated.", - DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn("apt.progress.FetchProgress is deprecated.", + DeprecationWarning, stacklevel=2) def start(self): """Called when the fetching starts.""" @@ -175,8 +178,9 @@ class CdromProgress(object): """Report the cdrom add progress.""" def __init__(self): - warnings.warn("apt.progress.CdromProgress is deprecated.", - DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn("apt.progress.CdromProgress is deprecated.", + DeprecationWarning, stacklevel=2) def askCdromName(self): """Ask for a cdrom name""" @@ -193,8 +197,9 @@ class DumbInstallProgress(base.InstallProgress): def __init__(self): base.InstallProgress.__init__(self) - warnings.warn("apt.progress.*InstallProgress are deprecated.", - DeprecationWarning, stacklevel=2) + if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.warn("apt.progress.*InstallProgress are deprecated.", + DeprecationWarning, stacklevel=2) def updateInterface(self): # *_stream were not available in the old progress reporting classes, diff --git a/debian/changelog b/debian/changelog index 747fea77..0013daf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.94.2ubuntu4) lucid; urgency=low + + * If PYTHON_APT_DEPRECATION_WARNINGS is unset, also disable the + deprecation warnings in apt_pkg directly; and don't just + disable any deprecation warning in apt/__init__.py (LP: #548623) + + -- Julian Andres Klode Mon, 29 Mar 2010 13:18:20 +0200 + python-apt (0.7.94.2ubuntu3) lucid; urgency=low * python/indexfile.cc: diff --git a/python/acquire-item.cc b/python/acquire-item.cc index cdb4a4bc..cb41f489 100644 --- a/python/acquire-item.cc +++ b/python/acquire-item.cc @@ -279,9 +279,10 @@ char *doc_GetPkgAcqFile = "GetPkgAcqFile(pkgAquire, uri[, md5, size, descr, shortDescr, destDir, destFile]) -> PkgAcqFile\n"; PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject * kwds) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgAcqFile() is " - "deprecated. Please see apt_pkg.AcquireFile() for the " - "replacement", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgAcqFile() is " + "deprecated. Please see apt_pkg.AcquireFile() for the " + "replacement", 1); PyObject *pyfetcher; char *uri, *md5, *descr, *shortDescr, *destDir, *destFile; int size = 0; diff --git a/python/acquire.cc b/python/acquire.cc index cc9ee310..3f24a3e7 100644 --- a/python/acquire.cc +++ b/python/acquire.cc @@ -372,8 +372,9 @@ PyTypeObject PyAcquire_Type = { #ifdef COMPAT_0_7 PyObject *GetAcquire(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetAcquire() is deprecated." - " Please see apt_pkg.Acquire() for the replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetAcquire() is deprecated." + " Please see apt_pkg.Acquire() for the replacement.", 1); return PkgAcquireNew(&PyAcquire_Type,Args,0); } #endif diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index 3d40832b..2a181619 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -54,8 +54,9 @@ static PyObject *py_gettext(PyObject *self, PyObject *Args) { static char *doc_newConfiguration = "Construct a configuration instance"; static PyObject *newConfiguration(PyObject *self,PyObject *args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.newConfiguration() is " - "deprecated. Use apt_pkg.Configuration() instead.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.newConfiguration() is " + "deprecated. Use apt_pkg.Configuration() instead.", 1); return CppPyObject_NEW(NULL, &PyConfiguration_Type, new Configuration()); } #endif diff --git a/python/cache.cc b/python/cache.cc index 3c9bc785..ba620099 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -105,8 +105,9 @@ static PyObject *PkgCacheUpdate(PyObject *Self,PyObject *Args) #ifdef COMPAT_0_7 static PyObject *PkgCacheClose(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Close() is deprecated, " - "because it causes segfaults. Delete the Cache instead.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Close() is deprecated, " + "because it causes segfaults. Delete the Cache instead.", 1); PyObject *CacheFilePy = GetOwner(Self); pkgCacheFile *Cache = GetCpp(CacheFilePy); Cache->Close(); @@ -117,9 +118,10 @@ static PyObject *PkgCacheClose(PyObject *Self,PyObject *Args) static PyObject *PkgCacheOpen(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Open() is deprecated, " - "because it causes memory leaks. Create a new Cache instead.", - 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Open() is deprecated, " + "because it causes memory leaks. Create a new Cache instead.", + 1); PyObject *CacheFilePy = GetOwner(Self); pkgCacheFile *Cache = GetCpp(CacheFilePy); @@ -1296,8 +1298,9 @@ PyTypeObject PyDependencyList_Type = #ifdef COMPAT_0_7 PyObject *TmpGetCache(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCache() is deprecated. " - "Please see apt_pkg.Cache() for the replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCache() is deprecated. " + "Please see apt_pkg.Cache() for the replacement.", 1); return PkgCacheNew(&PyCache_Type,Args,0); } #endif diff --git a/python/cdrom.cc b/python/cdrom.cc index 9eae49dc..d732a810 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -78,9 +78,10 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args) #ifdef COMPAT_0_7 static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the " - "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.", - 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the " + "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.", + 1); pkgCdrom &Cdrom = GetCpp(Self); PyObject *pyCdromProgressInst = 0; @@ -164,8 +165,9 @@ PyTypeObject PyCdrom_Type = { #ifdef COMPAT_0_7 PyObject *GetCdrom(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. " - "Please see apt_pkg.Cdrom() for the replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. " + "Please see apt_pkg.Cdrom() for the replacement.", 1); return cdrom_new(&PyCdrom_Type,Args,0); } #endif diff --git a/python/depcache.cc b/python/depcache.cc index 8b4e02b5..0d5d7882 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -694,8 +694,9 @@ PyTypeObject PyDepCache_Type = #ifdef COMPAT_0_7 PyObject *GetDepCache(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated" - ". Please see apt_pkg.DepCache() for the replacement.",1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated" + ". Please see apt_pkg.DepCache() for the replacement.",1); return PkgDepCacheNew(&PyDepCache_Type,Args,0); } #endif @@ -728,9 +729,10 @@ static PyObject *PkgProblemResolverNew(PyTypeObject *type,PyObject *Args,PyObjec #ifdef COMPAT_0_7 PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is" - " deprecated. Please see apt_pkg.ProblemResolver() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is" + " deprecated. Please see apt_pkg.ProblemResolver() for the " + "replacement.", 1); return PkgProblemResolverNew(&PyProblemResolver_Type,Args,0); } #endif @@ -989,9 +991,10 @@ PyTypeObject PyActionGroup_Type = #ifdef COMPAT_0_7 PyObject *GetPkgActionGroup(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is " - "deprecated. Please see apt_pkg.ActionGroup() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is " + "deprecated. Please see apt_pkg.ActionGroup() for the " + "replacement.", 1); return PkgActionGroupNew(&PyActionGroup_Type,Args,0); } #endif diff --git a/python/generic.cc b/python/generic.cc index f0980f2b..d08b12c0 100644 --- a/python/generic.cc +++ b/python/generic.cc @@ -101,7 +101,8 @@ PyObject *_PyAptObject_getattro(PyObject *self, PyObject *attr) { strlen(attrname) + 66]; sprintf(warning_string, "Attribute '%s' of the '%s' object is " "deprecated, use '%s' instead.", attrname, cls, newattrname); - PyErr_WarnEx(PyExc_DeprecationWarning, warning_string, 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, warning_string, 1); delete[] warning_string; } else { Py_XINCREF(ptype); diff --git a/python/generic.h b/python/generic.h index 31c1bc2d..98c6d82b 100644 --- a/python/generic.h +++ b/python/generic.h @@ -31,6 +31,7 @@ #include #include #include +#include #if PYTHON_API_VERSION < 1013 typedef int Py_ssize_t; diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index 2fda14ee..e8346b3d 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -39,9 +39,10 @@ static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) #ifdef COMPAT_0_7 PyObject *GetPkgManager(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " - "deprecated. Please see apt_pkg.PackageManager() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " + "deprecated. Please see apt_pkg.PackageManager() for the " + "replacement.", 1); return PkgManagerNew(&PyPackageManager_Type,Args,0); } #endif diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc index 0e00edcd..916a2e0f 100644 --- a/python/pkgrecords.cc +++ b/python/pkgrecords.cc @@ -195,9 +195,10 @@ PyTypeObject PyPackageRecords_Type = #ifdef COMPAT_0_7 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is " - "deprecated. Please see apt_pkg.Records() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is " + "deprecated. Please see apt_pkg.Records() for the " + "replacement.", 1); return PkgRecordsNew(&PyPackageRecords_Type,Args,0); } #endif diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc index 95f35f23..729a74b5 100644 --- a/python/pkgsrcrecords.cc +++ b/python/pkgsrcrecords.cc @@ -292,9 +292,10 @@ PyTypeObject PySourceRecords_Type = #ifdef COMPAT_0_7 PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSrcRecords() is " - "deprecated. Please see apt_pkg.SourceRecords() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSrcRecords() is " + "deprecated. Please see apt_pkg.SourceRecords() for the " + "replacement.", 1); if (PyArg_ParseTuple(Args,"") == 0) return 0; diff --git a/python/sourcelist.cc b/python/sourcelist.cc index 6184fee3..5a950b2c 100644 --- a/python/sourcelist.cc +++ b/python/sourcelist.cc @@ -157,9 +157,10 @@ PyTypeObject PySourceList_Type = #ifdef COMPAT_0_7 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSourceList() is " - "deprecated. Please see apt_pkg.SourceList() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSourceList() is " + "deprecated. Please see apt_pkg.SourceList() for the " + "replacement.", 1); return PkgSourceListNew(&PySourceList_Type,Args,0); } #endif diff --git a/python/tag.cc b/python/tag.cc index c7edcb31..bc470620 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -349,9 +349,10 @@ static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) { char *doc_ParseSection ="ParseSection(Text) -> TagSection() object. Deprecated."; PyObject *ParseSection(PyObject *self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseSection() is " - "deprecated. Please see apt_pkg.TagSection() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseSection() is " + "deprecated. Please see apt_pkg.TagSection() for the " + "replacement.", 1); return TagSecNew(&PyTagSection_Type,Args,0); } #endif @@ -388,9 +389,10 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) #ifdef COMPAT_0_7 char *doc_ParseTagFile = "ParseTagFile(File) -> TagFile() object. Deprecated."; PyObject *ParseTagFile(PyObject *self,PyObject *Args) { - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseTagFile() is " - "deprecated. Please see apt_pkg.TagFile() for the " - "replacement.", 1); + if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseTagFile() is " + "deprecated. Please see apt_pkg.TagFile() for the " + "replacement.", 1); return TagFileNew(&PyTagFile_Type,Args,0); } #endif diff --git a/tests/old/memleak.py b/tests/old/memleak.py old mode 100755 new mode 100644 -- cgit v1.2.3 From d10708447d2c79ebcc2ca780a74bc31a58490b44 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 31 Mar 2010 22:20:32 +0200 Subject: releasing version 0.7.94.2ubuntu5 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index af93a755..bf22d3d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.94.2ubuntu5) UNRELEASED; urgency=low +python-apt (0.7.94.2ubuntu5) lucid; urgency=low [ Julian Andres Klode ] * apt/package.py: -- cgit v1.2.3 From 06805303f9029f394813469a3bd243f9e4837ede Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Apr 2010 17:47:39 +0200 Subject: merged -r 396..397 from the debian-sid branch --- debian/changelog | 10 ++++++++++ python/cache.cc | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bf22d3d8..730c3954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +python-apt (0.7.94.2ubuntu5) UNRELEASEDlucid; urgency=low + + Cherry pick fix from the debian branch: + + [ Julian Andres Klode ] + * python/cache.cc: + - Fix PackageFile.not_automatic to use NotAutomatic instead of NotSource. + + -- Michael Vogt Wed, 14 Apr 2010 17:45:11 +0200 + python-apt (0.7.94.2ubuntu5) lucid; urgency=low [ Julian Andres Klode ] diff --git a/python/cache.cc b/python/cache.cc index 87902b1e..515f0193 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -968,7 +968,7 @@ static PyObject *PackageFile_GetNotSource(PyObject *Self,void*) static PyObject *PackageFile_GetNotAutomatic(PyObject *Self,void*) { pkgCache::PkgFileIterator &File = GetCpp(Self); - return Py_BuildValue("i",(File->Flags & pkgCache::Flag::NotSource) != 0); + return PyBool_FromLong((File->Flags & pkgCache::Flag::NotAutomatic) != 0); } static PyObject *PackageFile_GetID(PyObject *Self,void*) -- cgit v1.2.3 From 3246549ad1b241882fe5dbc7dffc67510ed18f9e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Apr 2010 17:58:08 +0200 Subject: releasing version 0.7.94.2ubuntu6 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 730c3954..38b2838c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.94.2ubuntu5) UNRELEASEDlucid; urgency=low +python-apt (0.7.94.2ubuntu6) lucid; urgency=low Cherry pick fix from the debian branch: -- cgit v1.2.3 From 55810483110e320b619a2518cebc462af50bafd8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 9 May 2010 13:16:21 +0200 Subject: * data/templates/Ubuntu.info.in: - add maverick --- data/templates/Ubuntu.info.in | 61 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 +++++ 2 files changed, 68 insertions(+) (limited to 'debian') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 6874fdc9..74095516 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,66 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: maverick +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 10.10 'Maverick Meerkat' +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: maverick +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*10.10 +MatchURI: cdrom:\[Ubuntu.*10.10 +_Description: Cdrom with Ubuntu 10.10 'Maverick Meerkat' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: maverick-security +ParentSuite: maverick +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: maverick-updates +ParentSuite: maverick +RepositoryType: deb +_Description: Recommended updates + +Suite: maverick-proposed +ParentSuite: maverick +RepositoryType: deb +_Description: Pre-released updates + +Suite: maverick-backports +ParentSuite: maverick +RepositoryType: deb +_Description: Unsupported updates + Suite: lucid RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ diff --git a/debian/changelog b/debian/changelog index 38b2838c..e5eb34c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.94.2ubuntu7) UNRELEASED; urgency=low + + * data/templates/Ubuntu.info.in: + - add maverick + + -- Colin Watson Sun, 09 May 2010 13:15:41 +0200 + python-apt (0.7.94.2ubuntu6) lucid; urgency=low Cherry pick fix from the debian branch: -- cgit v1.2.3 From 5a062bb328348cd3a2ac693b579d35d0ce8e11f0 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 9 May 2010 13:18:48 +0200 Subject: releasing version 0.7.94.2ubuntu7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e5eb34c3..3a87ffeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -python-apt (0.7.94.2ubuntu7) UNRELEASED; urgency=low +python-apt (0.7.94.2ubuntu7) maverick; urgency=low * data/templates/Ubuntu.info.in: - add maverick - -- Colin Watson Sun, 09 May 2010 13:15:41 +0200 + -- Colin Watson Sun, 09 May 2010 13:17:03 +0200 python-apt (0.7.94.2ubuntu6) lucid; urgency=low -- cgit v1.2.3 From 015acac98dc88fbbca5672c6be678c8dea491a8e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 1 Jun 2010 17:14:30 +0200 Subject: revert commit 346 (this re-enable the deprecation warnings) --- apt/__init__.py | 5 +++++ apt/deprecation.py | 13 ++++--------- apt/package.py | 2 +- apt/progress/old.py | 25 ++++++++++--------------- debian/changelog | 4 ++-- python/acquire-item.cc | 7 +++---- python/acquire.cc | 5 ++--- python/apt_pkgmodule.cc | 5 ++--- python/cache.cc | 17 +++++++---------- python/cdrom.cc | 12 +++++------- python/depcache.cc | 19 ++++++++----------- python/generic.cc | 3 +-- python/generic.h | 1 - python/pkgmanager.cc | 7 +++---- python/pkgrecords.cc | 7 +++---- python/pkgsrcrecords.cc | 7 +++---- python/sourcelist.cc | 7 +++---- python/tag.cc | 14 ++++++-------- 18 files changed, 68 insertions(+), 92 deletions(-) (limited to 'debian') diff --git a/apt/__init__.py b/apt/__init__.py index a8a8b8fc..8b66ad13 100644 --- a/apt/__init__.py +++ b/apt/__init__.py @@ -17,6 +17,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +import os +import warnings +if not "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + warnings.simplefilter('ignore', DeprecationWarning) + # import the core of apt_pkg """High-Level Interface for working with apt.""" import apt_pkg diff --git a/apt/deprecation.py b/apt/deprecation.py index cd33a51b..0f39ad63 100644 --- a/apt/deprecation.py +++ b/apt/deprecation.py @@ -24,7 +24,6 @@ not use it for anything outside the apt package. """ import re import operator -import os import warnings import apt_pkg @@ -50,14 +49,12 @@ class AttributeDeprecatedBy(object): """Issue a DeprecationWarning and return the requested value.""" if obj is None: return getattr(type_, self.attribute, self) - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) + warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) return self.getter(obj or type_) def __set__(self, obj, value): """Issue a DeprecationWarning and set the requested value.""" - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) + warnings.warn(self.__doc__, DeprecationWarning, stacklevel=2) setattr(obj, self.attribute, value) @@ -74,8 +71,7 @@ def function_deprecated_by(func, convert_names=True): def deprecated_function(*args, **kwds): """Wrapper around a deprecated function.""" - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn(warning, DeprecationWarning, stacklevel=2) + warnings.warn(warning, DeprecationWarning, stacklevel=2) if convert_names: for key in kwds.keys(): kwds[re.sub('([A-Z])', '_\\1', key).lower()] = kwds.pop(key) @@ -97,8 +93,7 @@ def deprecated_args(func): for key in kwds.keys(): new_key = re.sub('([A-Z])', '_\\1', key).lower() if new_key != key: - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn("Deprecated parameter %r" % key) + warnings.warn("Deprecated parameter %r" % key) kwds[new_key] = kwds.pop(key) return func(*args, **kwds) diff --git a/apt/package.py b/apt/package.py index 7dcead02..228a3385 100644 --- a/apt/package.py +++ b/apt/package.py @@ -120,7 +120,7 @@ class DeprecatedProperty(property): self.__doc__ = (doc or fget.__doc__ or '') def __get__(self, obj, type_=None): - if obj is not None and "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: + if obj is not None: warnings.warn("Accessed deprecated property %s.%s, please see the " "Version class for alternatives." % ((obj.__class__.__name__ or type_.__name__), diff --git a/apt/progress/old.py b/apt/progress/old.py index 2d3fdb59..4bd79f2e 100644 --- a/apt/progress/old.py +++ b/apt/progress/old.py @@ -42,9 +42,8 @@ class OpProgress(base.OpProgress): def __init__(self): base.OpProgress.__init__(self) - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn("apt.progress.OpProgress is deprecated.", - DeprecationWarning, stacklevel=2) + warnings.warn("apt.progress.OpProgress is deprecated.", + DeprecationWarning, stacklevel=2) subOp = AttributeDeprecatedBy('subop') Op = AttributeDeprecatedBy('op') @@ -55,9 +54,8 @@ class OpTextProgress(OpProgress, text.OpProgress): def __init__(self): text.OpProgress.__init__(self) - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn("apt.progress.OpTextProgress is deprecated.", - DeprecationWarning, stacklevel=2) + warnings.warn("apt.progress.OpTextProgress is deprecated.", + DeprecationWarning, stacklevel=2) class FetchProgress(object): @@ -77,9 +75,8 @@ class FetchProgress(object): self.totalBytes = 0 self.totalItems = 0 self.currentCPS = 0 - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn("apt.progress.FetchProgress is deprecated.", - DeprecationWarning, stacklevel=2) + warnings.warn("apt.progress.FetchProgress is deprecated.", + DeprecationWarning, stacklevel=2) def start(self): """Called when the fetching starts.""" @@ -178,9 +175,8 @@ class CdromProgress(object): """Report the cdrom add progress.""" def __init__(self): - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn("apt.progress.CdromProgress is deprecated.", - DeprecationWarning, stacklevel=2) + warnings.warn("apt.progress.CdromProgress is deprecated.", + DeprecationWarning, stacklevel=2) def askCdromName(self): """Ask for a cdrom name""" @@ -197,9 +193,8 @@ class DumbInstallProgress(base.InstallProgress): def __init__(self): base.InstallProgress.__init__(self) - if "PYTHON_APT_DEPRECATION_WARNINGS" in os.environ: - warnings.warn("apt.progress.*InstallProgress are deprecated.", - DeprecationWarning, stacklevel=2) + warnings.warn("apt.progress.*InstallProgress are deprecated.", + DeprecationWarning, stacklevel=2) def updateInterface(self): # *_stream were not available in the old progress reporting classes, diff --git a/debian/changelog b/debian/changelog index fd9632ce..ae937e41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -python-apt (0.7.95ubuntu1) maverick; urgency=low +python-apt (0.7.95ubuntu1) UNRELEASEDmaverick; urgency=low * merge from debian bzr, remaining changes: - different mirror list - + * revert commit 346 (this re-enable the deprecation warnings) * data/templates/gNewSense.info.in, data/templates/gNewSense.mirrors: - add gNewSense template and mirrors, thanks to Karl Goetz diff --git a/python/acquire-item.cc b/python/acquire-item.cc index e94ea352..4b7dc34d 100644 --- a/python/acquire-item.cc +++ b/python/acquire-item.cc @@ -320,10 +320,9 @@ char *doc_GetPkgAcqFile = "GetPkgAcqFile(pkgAquire, uri[, md5, size, descr, shortDescr, destDir, destFile]) -> PkgAcqFile\n"; PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject * kwds) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgAcqFile() is " - "deprecated. Please see apt_pkg.AcquireFile() for the " - "replacement", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgAcqFile() is " + "deprecated. Please see apt_pkg.AcquireFile() for the " + "replacement", 1); PyObject *pyfetcher; char *uri, *md5, *descr, *shortDescr, *destDir, *destFile; int size = 0; diff --git a/python/acquire.cc b/python/acquire.cc index 1d750f37..6f9a1412 100644 --- a/python/acquire.cc +++ b/python/acquire.cc @@ -404,9 +404,8 @@ PyTypeObject PyAcquire_Type = { #ifdef COMPAT_0_7 PyObject *GetAcquire(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetAcquire() is deprecated." - " Please see apt_pkg.Acquire() for the replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetAcquire() is deprecated." + " Please see apt_pkg.Acquire() for the replacement.", 1); return PkgAcquireNew(&PyAcquire_Type,Args,0); } #endif diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc index c6353fcc..a1e9ada0 100644 --- a/python/apt_pkgmodule.cc +++ b/python/apt_pkgmodule.cc @@ -54,9 +54,8 @@ static PyObject *py_gettext(PyObject *self, PyObject *Args) { static char *doc_newConfiguration = "Construct a configuration instance"; static PyObject *newConfiguration(PyObject *self,PyObject *args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.newConfiguration() is " - "deprecated. Use apt_pkg.Configuration() instead.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.newConfiguration() is " + "deprecated. Use apt_pkg.Configuration() instead.", 1); return CppPyObject_NEW(NULL, &PyConfiguration_Type, new Configuration()); } #endif diff --git a/python/cache.cc b/python/cache.cc index b0cfb469..e31f6a65 100644 --- a/python/cache.cc +++ b/python/cache.cc @@ -120,9 +120,8 @@ static PyObject *PkgCacheUpdate(PyObject *Self,PyObject *Args) #ifdef COMPAT_0_7 static PyObject *PkgCacheClose(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Close() is deprecated, " - "because it causes segfaults. Delete the Cache instead.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Close() is deprecated, " + "because it causes segfaults. Delete the Cache instead.", 1); PyObject *CacheFilePy = GetOwner(Self); pkgCacheFile *Cache = GetCpp(CacheFilePy); Cache->Close(); @@ -133,10 +132,9 @@ static PyObject *PkgCacheClose(PyObject *Self,PyObject *Args) static PyObject *PkgCacheOpen(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Open() is deprecated, " - "because it causes memory leaks. Create a new Cache instead.", - 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "Cache.Open() is deprecated, " + "because it causes memory leaks. Create a new Cache instead.", + 1); PyObject *CacheFilePy = GetOwner(Self); pkgCacheFile *Cache = GetCpp(CacheFilePy); @@ -1478,9 +1476,8 @@ PyTypeObject PyDependencyList_Type = #ifdef COMPAT_0_7 PyObject *TmpGetCache(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCache() is deprecated. " - "Please see apt_pkg.Cache() for the replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCache() is deprecated. " + "Please see apt_pkg.Cache() for the replacement.", 1); return PkgCacheNew(&PyCache_Type,Args,0); } #endif diff --git a/python/cdrom.cc b/python/cdrom.cc index e6cc8e29..7f89e9d3 100644 --- a/python/cdrom.cc +++ b/python/cdrom.cc @@ -81,10 +81,9 @@ static PyObject *cdrom_ident(PyObject *Self,PyObject *Args) #ifdef COMPAT_0_7 static PyObject *cdrom_ident_old(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the " - "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.", - 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "Method 'Ident' of the " + "'apt_pkg.Cdrom' object is deprecated, use 'ident' instead.", + 1); pkgCdrom &Cdrom = GetCpp(Self); PyObject *pyCdromProgressInst = 0; @@ -169,9 +168,8 @@ PyTypeObject PyCdrom_Type = { #ifdef COMPAT_0_7 PyObject *GetCdrom(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. " - "Please see apt_pkg.Cdrom() for the replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetCdrom() is deprecated. " + "Please see apt_pkg.Cdrom() for the replacement.", 1); return cdrom_new(&PyCdrom_Type,Args,0); } #endif diff --git a/python/depcache.cc b/python/depcache.cc index e7d7d946..cd098f2f 100644 --- a/python/depcache.cc +++ b/python/depcache.cc @@ -766,9 +766,8 @@ PyTypeObject PyDepCache_Type = #ifdef COMPAT_0_7 PyObject *GetDepCache(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated" - ". Please see apt_pkg.DepCache() for the replacement.",1); + PyErr_WarnEx(PyExc_DeprecationWarning,"apt_pkg.GetDepCache() is deprecated" + ". Please see apt_pkg.DepCache() for the replacement.",1); return PkgDepCacheNew(&PyDepCache_Type,Args,0); } #endif @@ -801,10 +800,9 @@ static PyObject *PkgProblemResolverNew(PyTypeObject *type,PyObject *Args,PyObjec #ifdef COMPAT_0_7 PyObject *GetPkgProblemResolver(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is" - " deprecated. Please see apt_pkg.ProblemResolver() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgProblemResolver() is" + " deprecated. Please see apt_pkg.ProblemResolver() for the " + "replacement.", 1); return PkgProblemResolverNew(&PyProblemResolver_Type,Args,0); } #endif @@ -1093,10 +1091,9 @@ PyTypeObject PyActionGroup_Type = #ifdef COMPAT_0_7 PyObject *GetPkgActionGroup(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is " - "deprecated. Please see apt_pkg.ActionGroup() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgActionGroup() is " + "deprecated. Please see apt_pkg.ActionGroup() for the " + "replacement.", 1); return PkgActionGroupNew(&PyActionGroup_Type,Args,0); } #endif diff --git a/python/generic.cc b/python/generic.cc index 0719d1bb..e04743ff 100644 --- a/python/generic.cc +++ b/python/generic.cc @@ -102,8 +102,7 @@ PyObject *_PyAptObject_getattro(PyObject *self, PyObject *attr) { strlen(attrname) + 66]; sprintf(warning_string, "Attribute '%s' of the '%s' object is " "deprecated, use '%s' instead.", attrname, cls, newattrname); - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, warning_string, 1); + PyErr_WarnEx(PyExc_DeprecationWarning, warning_string, 1); delete[] warning_string; } else { Py_XINCREF(ptype); diff --git a/python/generic.h b/python/generic.h index 98c6d82b..31c1bc2d 100644 --- a/python/generic.h +++ b/python/generic.h @@ -31,7 +31,6 @@ #include #include #include -#include #if PYTHON_API_VERSION < 1013 typedef int Py_ssize_t; diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc index df66c8c7..95e8c27e 100644 --- a/python/pkgmanager.cc +++ b/python/pkgmanager.cc @@ -39,10 +39,9 @@ static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) #ifdef COMPAT_0_7 PyObject *GetPkgManager(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " - "deprecated. Please see apt_pkg.PackageManager() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is " + "deprecated. Please see apt_pkg.PackageManager() for the " + "replacement.", 1); return PkgManagerNew(&PyPackageManager_Type,Args,0); } #endif diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc index efa99b62..8d2cb502 100644 --- a/python/pkgrecords.cc +++ b/python/pkgrecords.cc @@ -221,10 +221,9 @@ PyTypeObject PyPackageRecords_Type = #ifdef COMPAT_0_7 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is " - "deprecated. Please see apt_pkg.Records() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgRecords() is " + "deprecated. Please see apt_pkg.Records() for the " + "replacement.", 1); return PkgRecordsNew(&PyPackageRecords_Type,Args,0); } #endif diff --git a/python/pkgsrcrecords.cc b/python/pkgsrcrecords.cc index da3d0e04..aad3ef7e 100644 --- a/python/pkgsrcrecords.cc +++ b/python/pkgsrcrecords.cc @@ -317,10 +317,9 @@ PyTypeObject PySourceRecords_Type = #ifdef COMPAT_0_7 PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSrcRecords() is " - "deprecated. Please see apt_pkg.SourceRecords() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSrcRecords() is " + "deprecated. Please see apt_pkg.SourceRecords() for the " + "replacement.", 1); if (PyArg_ParseTuple(Args,"") == 0) return 0; diff --git a/python/sourcelist.cc b/python/sourcelist.cc index b04bf5cb..784b161e 100644 --- a/python/sourcelist.cc +++ b/python/sourcelist.cc @@ -171,10 +171,9 @@ PyTypeObject PySourceList_Type = #ifdef COMPAT_0_7 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSourceList() is " - "deprecated. Please see apt_pkg.SourceList() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPkgSourceList() is " + "deprecated. Please see apt_pkg.SourceList() for the " + "replacement.", 1); return PkgSourceListNew(&PySourceList_Type,Args,0); } #endif diff --git a/python/tag.cc b/python/tag.cc index 5db34c1d..9fe12a1a 100644 --- a/python/tag.cc +++ b/python/tag.cc @@ -371,10 +371,9 @@ static PyObject *TagSecNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) { char *doc_ParseSection = "ParseSection(Text) -> TagSection()\n\nDeprecated."; PyObject *ParseSection(PyObject *self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseSection() is " - "deprecated. Please see apt_pkg.TagSection() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseSection() is " + "deprecated. Please see apt_pkg.TagSection() for the " + "replacement.", 1); return TagSecNew(&PyTagSection_Type,Args,0); } #endif @@ -411,10 +410,9 @@ static PyObject *TagFileNew(PyTypeObject *type,PyObject *Args,PyObject *kwds) #ifdef COMPAT_0_7 char *doc_ParseTagFile = "ParseTagFile(file) -> TagFile()\n\nDeprecated."; PyObject *ParseTagFile(PyObject *self,PyObject *Args) { - if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL) - PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseTagFile() is " - "deprecated. Please see apt_pkg.TagFile() for the " - "replacement.", 1); + PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.ParseTagFile() is " + "deprecated. Please see apt_pkg.TagFile() for the " + "replacement.", 1); return TagFileNew(&PyTagFile_Type,Args,0); } #endif -- cgit v1.2.3 From e1f8d27b05abfa6ea4da792ed58be192500ab86b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 1 Jun 2010 17:31:37 +0200 Subject: * doc/source/conf.py: - do not fail for non digit version numbers like 0.7.95ubuntu1 --- debian/changelog | 2 ++ doc/source/conf.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ae937e41..44ee3c17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ python-apt (0.7.95ubuntu1) UNRELEASEDmaverick; urgency=low * data/templates/gNewSense.info.in, data/templates/gNewSense.mirrors: - add gNewSense template and mirrors, thanks to Karl Goetz + * doc/source/conf.py: + - do not fail for non digit version numbers like 0.7.95ubuntu1 -- Michael Vogt Tue, 01 Jun 2010 17:06:49 +0200 diff --git a/doc/source/conf.py b/doc/source/conf.py index 5f82d5eb..05490da7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -78,7 +78,8 @@ except KeyError: release = p2.communicate()[0] # Handle the alpha release scheme -if int(release.split("~")[0].split(".")[2]) >= 90: +release_raw = release.split("~")[0].split(".")[2] +if release_raw.isdigit() and int(release_raw) >= 90: version_s = release.split("~")[0].split(".")[:3] # Set the version to 0.X.100 if the release is 0.X.9Y (0.7.90 => 0.7.100) # Use @@ -90,6 +91,7 @@ if int(release.split("~")[0].split(".")[2]) >= 90: del version_s else: version = '.'.join(release.split("~")[0].split('.')[:3]) +del release_raw # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- cgit v1.2.3 From 919e1b4d3dad602130aff9bb56d6741be02d831d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 1 Jun 2010 17:59:38 +0200 Subject: releasing version 0.7.95ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 44ee3c17..dde80a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.95ubuntu1) UNRELEASEDmaverick; urgency=low +python-apt (0.7.95ubuntu1) maverick; urgency=low * merge from debian bzr, remaining changes: - different mirror list @@ -9,7 +9,7 @@ python-apt (0.7.95ubuntu1) UNRELEASEDmaverick; urgency=low * doc/source/conf.py: - do not fail for non digit version numbers like 0.7.95ubuntu1 - -- Michael Vogt Tue, 01 Jun 2010 17:06:49 +0200 + -- Michael Vogt Tue, 01 Jun 2010 17:36:56 +0200 python-apt (0.7.95) unstable; urgency=low -- cgit v1.2.3