From 9cfc2cd1213ab98d744b42bbfe3a4f8ca5e870ea Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 5 Jul 2010 18:22:37 +0200 Subject: Re-enable Python 3 support for latest python-default changes (hack). --- debian/changelog | 3 +++ debian/rules | 2 ++ utils/pyversions | 2 ++ 3 files changed, 7 insertions(+) create mode 100755 utils/pyversions diff --git a/debian/changelog b/debian/changelog index b8ae49c1..e82c0487 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ python-apt (0.7.96) UNRELEASED; urgency=low latter is disastrous if we use compressed package indexes, and slower than necessary for uncompressed indexes. + [ Julian Andres Klode ] + * Re-enable Python 3 support for latest python-default changes (hack). + -- Michael Vogt Tue, 01 Jun 2010 16:20:00 +0200 python-apt (0.7.95) unstable; urgency=low diff --git a/debian/rules b/debian/rules index a65c5cfd..e93d682f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ export DH_PYCENTRAL=nomove export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') export CFLAGS=-Wno-write-strings -DCOMPAT_0_7 +export PATH :=$(CURDIR)/utils:$(PATH) +export SHELL=PATH=$(PATH) sh %: dh --with python-central $@ diff --git a/utils/pyversions b/utils/pyversions new file mode 100755 index 00000000..3accad3f --- /dev/null +++ b/utils/pyversions @@ -0,0 +1,2 @@ +#!/bin/sh +(/usr/bin/pyversions "$@"; /usr/bin/py3versions "$@"; ) | tr '\n' ' ' -- cgit v1.2.3 From dc7c1b076167d70b5c2f5c99c67160a0730814d5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 5 Jul 2010 18:25:58 +0200 Subject: rules: Fix SHELL override. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index e93d682f..f7cca130 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export DH_PYCENTRAL=nomove export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') export CFLAGS=-Wno-write-strings -DCOMPAT_0_7 export PATH :=$(CURDIR)/utils:$(PATH) -export SHELL=PATH=$(PATH) sh +export SHELL = env PATH=$(PATH) sh %: dh --with python-central $@ -- cgit v1.2.3 From 750c50bd08d909b5802f892c88441000609183c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Jul 2010 18:28:48 +0200 Subject: apt/debfile.py: make to_{hex,strish} staticmethods --- apt/debfile.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apt/debfile.py b/apt/debfile.py index 81cd1dd2..06854cf2 100644 --- a/apt/debfile.py +++ b/apt/debfile.py @@ -506,6 +506,7 @@ class DebPackage(object): content.append(name) return sorted(content) + @staticmethod def to_hex(self, in_data): hex = "" for (i, c) in enumerate(in_data): @@ -514,6 +515,7 @@ class DebPackage(object): hex += "%2.2x " % ord(c) return hex + @staticmethod def to_strish(self, in_data): s = "" for c in in_data: -- cgit v1.2.3 From 9da50582230f21c9267a25eb92dbf3c080dfcafc Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 5 Jul 2010 18:35:07 +0200 Subject: test_debfile: Do not insert path (breaks py3k, use test_all for testing). --- tests/test_debfile.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 02e25117..b9ed89c3 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -10,9 +10,6 @@ import os import logging import unittest -import sys -sys.path.insert(0, "..") - import apt.debfile -- cgit v1.2.3 From e94861e437dc544da9bf4a0161a25dedafd93f34 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Jul 2010 10:35:57 +0200 Subject: * python/progress.cc: - deal with missing return value from the acquire progress in pulse() --- debian/changelog | 2 ++ python/progress.cc | 5 ++++- tests/test_progress.py | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98be965a..b592eb84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ python-apt (0.7.96) UNRELEASED; urgency=low - fix py3 compatibility * tests/test_debs/*.deb, tests/test_debfile.py: - add automatic test based on the test debs from gdebi + * python/progress.cc: + - deal with missing return value from the acquire progress in pulse() [ Martin Pitt ] * tests/test_apt_cache.py: Test accessing the record of all packages during diff --git a/python/progress.cc b/python/progress.cc index 9002b3eb..437309cf 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -300,7 +300,10 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) Py_INCREF(pyAcquire); if (RunSimpleCallback("pulse", TUPLEIZE(pyAcquire) , &result1)) { - if (result1 != NULL && PyArg_Parse(result1, "b", &res1) && res1 == false) { + if (result1 != NULL && + result1 != Py_None && + PyArg_Parse(result1, "b", &res1) && + res1 == false) { // the user returned a explicit false here, stop PyCbObj_BEGIN_ALLOW_THREADS return false; diff --git a/tests/test_progress.py b/tests/test_progress.py index 2ab8ce5e..ffab5bc0 100644 --- a/tests/test_progress.py +++ b/tests/test_progress.py @@ -15,6 +15,9 @@ import os class TestAcquireProgress(apt.progress.base.AcquireProgress): def pulse(self, owner): self.pulsed = True + # there should be a return value here, either (True,False) + # but often this is forgoten (and causes odd error messages) + # so the lib supports it. we test the lack of support value here class TestProgress(unittest.TestCase): -- cgit v1.2.3 From 443fb34e5fa04392c82c0cf56d3ea3e086c704f8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Jul 2010 10:42:26 +0200 Subject: tests/test_apt_cache.py: fixes for 0.8 compatibility --- tests/test_apt_cache.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_apt_cache.py b/tests/test_apt_cache.py index 653a0f48..a43e92d2 100644 --- a/tests/test_apt_cache.py +++ b/tests/test_apt_cache.py @@ -62,13 +62,13 @@ class TestAptCache(unittest.TestCase): def test_dpkg_journal_dirty(self): # backup old value - old_status = apt_pkg.Config.find_file("Dir::State::status") + old_status = apt_pkg.config.find_file("Dir::State::status") # create tmp env tmpdir = tempfile.mkdtemp() dpkg_dir = os.path.join(tmpdir,"var","lib","dpkg") os.makedirs(os.path.join(dpkg_dir,"updates")) open(os.path.join(dpkg_dir,"status"), "w") - apt_pkg.Config.set("Dir::State::status", + apt_pkg.config.set("Dir::State::status", os.path.join(dpkg_dir,"status")) cache = apt.Cache() # test empty @@ -80,7 +80,7 @@ class TestAptCache(unittest.TestCase): open(os.path.join(dpkg_dir,"updates","000"), "w") self.assertTrue(cache.dpkg_journal_dirty) # reset config value - apt_pkg.Config.set("Dir::State::status", old_status) + apt_pkg.config.set("Dir::State::status", old_status) if __name__ == "__main__": -- cgit v1.2.3 From dd58eafe47bb69797966f70f1181e4046856cfe4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Jul 2010 10:47:00 +0200 Subject: apt/cache.py: use apt_pkg.config instead of apt_pkg.Config --- apt/cache.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt/cache.py b/apt/cache.py index 26532c76..f64b489a 100644 --- a/apt/cache.py +++ b/apt/cache.py @@ -471,7 +471,8 @@ class Cache(object): fix the system if dpkg got interrupted is to run 'dpkg --configure -a' as root. """ - dpkg_status_dir = os.path.dirname(apt_pkg.Config.find_file("Dir::State::status")) + dpkg_status_dir = os.path.dirname( + apt_pkg.config.find_file("Dir::State::status")) for f in os.listdir(os.path.join(dpkg_status_dir, "updates")): if fnmatch.fnmatch(f, "[0-9]*"): return True -- cgit v1.2.3 From e965c1321637d50986c243468d8095077f3e80ca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jul 2010 22:51:51 +0200 Subject: tests/test_aptsources.py: fix test by forcing id=Ubuntu --- tests/test_aptsources.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 767f5244..3ef20f64 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -98,7 +98,7 @@ class TestAptSources(unittest.TestCase): apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" "sources.list.testDistribution") sources = aptsources.sourceslist.SourcesList(True, self.templates) - distro = aptsources.distro.get_distro() + distro = aptsources.distro.get_distro(id="Ubuntu") distro.get_sources(sources) # test if all suits of the current distro were detected correctly dist_templates = set() @@ -111,7 +111,7 @@ class TestAptSources(unittest.TestCase): apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" "sources.list.testDistribution") sources = aptsources.sourceslist.SourcesList(True, self.templates) - distro = aptsources.distro.get_distro() + distro = aptsources.distro.get_distro(id="Ubuntu") distro.get_sources(sources) # test if all suits of the current distro were detected correctly dist_templates = set() -- cgit v1.2.3 From 51668ea3a95413a06684433a09f2097edc8e62b2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Jul 2010 09:51:42 +0200 Subject: po/*: refreshed po --- po/python-apt.pot | 67 ++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/po/python-apt.pot b/po/python-apt.pot index 9c10c43f..0d683700 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-02 14:12+0200\n" +"POT-Creation-Date: 2010-07-12 09:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -413,91 +414,87 @@ msgid "" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:142 +#: ../apt/debfile.py:79 +#, python-format +msgid "List of files for '%s' could not be read" +msgstr "" + +#: ../apt/debfile.py:164 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:163 +#: ../apt/debfile.py:185 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation -#: ../apt/debfile.py:297 +#: ../apt/debfile.py:323 #, python-format msgid "" -"Breaks existing package '%(pkgname)s' dependency %(depname)s (%(deprelation)" -"s %(depversion)s)" +"Breaks existing package '%(pkgname)s' dependency %(depname)s " +"(%(deprelation)s %(depversion)s)" msgstr "" #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation -#: ../apt/debfile.py:313 +#: ../apt/debfile.py:339 +#, python-format +msgid "" +"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " +"%(targetver)s)" +msgstr "" + +#: ../apt/debfile.py:348 #, python-format msgid "" -"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s %" -"(targetver)s)" +"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " +"the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -#: ../apt/debfile.py:359 +#: ../apt/debfile.py:394 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:364 +#: ../apt/debfile.py:399 #, python-format msgid "Wrong architecture '%s'" msgstr "" #. the deb is older than the installed -#: ../apt/debfile.py:371 +#: ../apt/debfile.py:406 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:396 +#: ../apt/debfile.py:431 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:425 +#: ../apt/debfile.py:461 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:467 ../apt/debfile.py:513 ../apt/debfile.py:524 +#: ../apt/debfile.py:503 ../apt/debfile.py:551 ../apt/debfile.py:562 msgid "Python-debian module not available" msgstr "" -#: ../apt/debfile.py:497 +#: ../apt/debfile.py:535 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:503 +#: ../apt/debfile.py:541 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:549 -msgid "List of files could not be read, please report this as a bug" -msgstr "" - -#: ../apt/debfile.py:552 -#, python-format -msgid "IOError during filelist read: %s" -msgstr "" - -#. Translators: it's for missing entries in the deb package, -#. e.g. a missing "Maintainer" field -#: ../apt/debfile.py:559 -#, python-format -msgid "%s is not available" -msgstr "" - -#: ../apt/debfile.py:632 +#: ../apt/debfile.py:638 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:642 +#: ../apt/debfile.py:648 msgid "An essential package would be removed" msgstr "" -- cgit v1.2.3 From f6b65060dac5f655b6273a227f81e9b947694596 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Jul 2010 09:52:05 +0200 Subject: releasing version 0.7.96 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b592eb84..b44031b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-apt (0.7.96) UNRELEASED; urgency=low +python-apt (0.7.96) unstable; urgency=low [ Michael Vogt ] * data/templates/gNewSense.info.in, @@ -42,7 +42,7 @@ python-apt (0.7.96) UNRELEASED; urgency=low [ Julian Andres Klode ] * Re-enable Python 3 support for latest python-default changes (hack). - -- Michael Vogt Tue, 01 Jun 2010 16:20:00 +0200 + -- Michael Vogt Mon, 12 Jul 2010 08:58:42 +0200 python-apt (0.7.95) unstable; urgency=low -- cgit v1.2.3 From 3b155e595fed78f8eac22de78106cd3dcad9793c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Jul 2010 14:42:39 +0200 Subject: tests/test_debfile.py: move test_debs into tests/data --- tests/data/test_debs/gdebi-test1.deb | Bin 0 -> 934 bytes tests/data/test_debs/gdebi-test10.deb | Bin 0 -> 614 bytes tests/data/test_debs/gdebi-test2.deb | Bin 0 -> 554 bytes tests/data/test_debs/gdebi-test3.deb | Bin 0 -> 570 bytes tests/data/test_debs/gdebi-test4.deb | Bin 0 -> 2306 bytes tests/data/test_debs/gdebi-test5.deb | Bin 0 -> 2306 bytes tests/data/test_debs/gdebi-test6.deb | Bin 0 -> 600 bytes tests/data/test_debs/gdebi-test7.deb | Bin 0 -> 578 bytes tests/data/test_debs/gdebi-test8.deb | Bin 0 -> 598 bytes tests/data/test_debs/gdebi-test9.deb | Bin 0 -> 586 bytes tests/data/test_debs/var/lib/dpkg/status | 77 +++++++++++++++++++++++++++++++ tests/test_debfile.py | 4 +- tests/test_debs/gdebi-test1.deb | Bin 934 -> 0 bytes tests/test_debs/gdebi-test10.deb | Bin 614 -> 0 bytes tests/test_debs/gdebi-test2.deb | Bin 554 -> 0 bytes tests/test_debs/gdebi-test3.deb | Bin 570 -> 0 bytes tests/test_debs/gdebi-test4.deb | Bin 2306 -> 0 bytes tests/test_debs/gdebi-test5.deb | Bin 2306 -> 0 bytes tests/test_debs/gdebi-test6.deb | Bin 600 -> 0 bytes tests/test_debs/gdebi-test7.deb | Bin 578 -> 0 bytes tests/test_debs/gdebi-test8.deb | Bin 598 -> 0 bytes tests/test_debs/gdebi-test9.deb | Bin 586 -> 0 bytes tests/test_debs/var/lib/dpkg/status | 77 ------------------------------- 23 files changed, 79 insertions(+), 79 deletions(-) create mode 100644 tests/data/test_debs/gdebi-test1.deb create mode 100644 tests/data/test_debs/gdebi-test10.deb create mode 100644 tests/data/test_debs/gdebi-test2.deb create mode 100644 tests/data/test_debs/gdebi-test3.deb create mode 100644 tests/data/test_debs/gdebi-test4.deb create mode 100644 tests/data/test_debs/gdebi-test5.deb create mode 100644 tests/data/test_debs/gdebi-test6.deb create mode 100644 tests/data/test_debs/gdebi-test7.deb create mode 100644 tests/data/test_debs/gdebi-test8.deb create mode 100644 tests/data/test_debs/gdebi-test9.deb create mode 100644 tests/data/test_debs/var/lib/dpkg/status delete mode 100644 tests/test_debs/gdebi-test1.deb delete mode 100644 tests/test_debs/gdebi-test10.deb delete mode 100644 tests/test_debs/gdebi-test2.deb delete mode 100644 tests/test_debs/gdebi-test3.deb delete mode 100644 tests/test_debs/gdebi-test4.deb delete mode 100644 tests/test_debs/gdebi-test5.deb delete mode 100644 tests/test_debs/gdebi-test6.deb delete mode 100644 tests/test_debs/gdebi-test7.deb delete mode 100644 tests/test_debs/gdebi-test8.deb delete mode 100644 tests/test_debs/gdebi-test9.deb delete mode 100644 tests/test_debs/var/lib/dpkg/status diff --git a/tests/data/test_debs/gdebi-test1.deb b/tests/data/test_debs/gdebi-test1.deb new file mode 100644 index 00000000..ea9991ac Binary files /dev/null and b/tests/data/test_debs/gdebi-test1.deb differ diff --git a/tests/data/test_debs/gdebi-test10.deb b/tests/data/test_debs/gdebi-test10.deb new file mode 100644 index 00000000..ca43ace6 Binary files /dev/null and b/tests/data/test_debs/gdebi-test10.deb differ diff --git a/tests/data/test_debs/gdebi-test2.deb b/tests/data/test_debs/gdebi-test2.deb new file mode 100644 index 00000000..307ac689 Binary files /dev/null and b/tests/data/test_debs/gdebi-test2.deb differ diff --git a/tests/data/test_debs/gdebi-test3.deb b/tests/data/test_debs/gdebi-test3.deb new file mode 100644 index 00000000..436b9258 Binary files /dev/null and b/tests/data/test_debs/gdebi-test3.deb differ diff --git a/tests/data/test_debs/gdebi-test4.deb b/tests/data/test_debs/gdebi-test4.deb new file mode 100644 index 00000000..9eb92d1b Binary files /dev/null and b/tests/data/test_debs/gdebi-test4.deb differ diff --git a/tests/data/test_debs/gdebi-test5.deb b/tests/data/test_debs/gdebi-test5.deb new file mode 100644 index 00000000..0c98c03f Binary files /dev/null and b/tests/data/test_debs/gdebi-test5.deb differ diff --git a/tests/data/test_debs/gdebi-test6.deb b/tests/data/test_debs/gdebi-test6.deb new file mode 100644 index 00000000..8ceacadc Binary files /dev/null and b/tests/data/test_debs/gdebi-test6.deb differ diff --git a/tests/data/test_debs/gdebi-test7.deb b/tests/data/test_debs/gdebi-test7.deb new file mode 100644 index 00000000..c0414990 Binary files /dev/null and b/tests/data/test_debs/gdebi-test7.deb differ diff --git a/tests/data/test_debs/gdebi-test8.deb b/tests/data/test_debs/gdebi-test8.deb new file mode 100644 index 00000000..439f8ca7 Binary files /dev/null and b/tests/data/test_debs/gdebi-test8.deb differ diff --git a/tests/data/test_debs/gdebi-test9.deb b/tests/data/test_debs/gdebi-test9.deb new file mode 100644 index 00000000..9901d906 Binary files /dev/null and b/tests/data/test_debs/gdebi-test9.deb differ diff --git a/tests/data/test_debs/var/lib/dpkg/status b/tests/data/test_debs/var/lib/dpkg/status new file mode 100644 index 00000000..443262e1 --- /dev/null +++ b/tests/data/test_debs/var/lib/dpkg/status @@ -0,0 +1,77 @@ +Package: apt +Status: hold ok installed +Priority: important +Section: admin +Installed-Size: 5456 +Maintainer: APT Development Team +Architecture: i386 +Version: 0.7.25.3 +Replaces: libapt-pkg-dev (<< 0.3.7), libapt-pkg-doc (<< 0.3.7) +Provides: libapt-pkg-libc6.10-6-4.8 +Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt +Conffiles: + /etc/cron.daily/apt 3528ddf873535d4c268d83e73e85dc79 + /etc/apt/apt.conf.d/01autoremove 6154750d39a78704b5bbf6fafd65ada7 + /etc/logrotate.d/apt 179f2ed4f85cbaca12fa3d69c2a4a1c3 + /etc/apt/apt.conf.d/01ubuntu 078b96538a377743bee0f554eb5b2fc6 obsolete +Description: Advanced front-end for dpkg + This is Debian's next generation front-end for the dpkg package manager. + It provides the apt-get utility and APT dselect method that provides a + simpler, safer way to install and upgrade packages. + . + APT features complete installation ordering, multiple source capability + and several other unique features, see the Users Guide in apt-doc. + +Package: postfix +Status: install ok installed +Priority: extra +Section: mail +Installed-Size: 3488 +Maintainer: LaMont Jones +Architecture: i386 +Version: 2.7.0-1 +Replaces: mail-transport-agent, postfix-tls +Provides: default-mta, mail-transport-agent, postfix-tls +Recommends: python +Suggests: procmail, postfix-mysql, postfix-pgsql, postfix-ldap, postfix-pcre, sasl2-bin, libsasl2-modules, resolvconf, postfix-cdb, mail-reader, ufw +Conflicts: libnss-db (<< 2.2-3), mail-transport-agent, postfix-tls, smail +Conffiles: + /etc/init.d/postfix e47d7ef0cbd2e212324812d74c409d77 + /etc/ppp/ip-up.d/postfix fccc53fc4eeeab46941ebcc95a71e766 + /etc/ppp/ip-down.d/postfix 52275dc23864f3bfca412c7558e28fe6 + /etc/network/if-up.d/postfix fccc53fc4eeeab46941ebcc95a71e766 + /etc/network/if-down.d/postfix 52275dc23864f3bfca412c7558e28fe6 + /etc/postfix/postfix-script 0d01860b2f0778cf41951c801f538b30 + /etc/postfix/post-install d53706c232f6497539fa0c99df674b33 + /etc/postfix/postfix-files 47e63262ab84069c840556b469b0fb2f + /etc/rsyslog.d/postfix.conf d8a09827fff2a22311e4dd4a83e95c83 + /etc/ufw/applications.d/postfix 6716a7729145a40bf7cb721c8dc6c3b0 + /etc/resolvconf/update-libc.d/postfix 6c80adbe120bc46cbf42658a7364e17f +Description: High-performance mail transport agent + Postfix is Wietse Venema's mail transport agent that started life as an + alternative to the widely-used Sendmail program. Postfix attempts to + be fast, easy to administer, and secure, while at the same time being + sendmail compatible enough to not upset existing users. Thus, the outside + has a sendmail-ish flavor, but the inside is completely different. + +Package: debconf +Status: install ok installed +Priority: important +Section: admin +Installed-Size: 924 +Maintainer: Debconf Developers +Architecture: all +Version: 1.5.28 +Replaces: debconf-tiny +Provides: debconf-2.0 +Recommends: apt-utils (>= 0.5.1) +Suggests: debconf-doc, debconf-utils, whiptail | dialog | gnome-utils, libterm-readline-gnu-perl, libgnome2-perl, libnet-ldap-perl, perl +Conflicts: apt (<< 0.3.12.1), cdebconf (<< 0.96), debconf-tiny, debconf-utils (<< 1.3.22), dialog (<< 0.9b-20020814-1), menu (<= 2.1.3-1), whiptail (<< 0.51.4-11), whiptail-utf8 (<= 0.50.17-13) +Conffiles: + /etc/apt/apt.conf.d/70debconf 7e9d09d5801a42b4926b736b8eeabb73 + /etc/bash_completion.d/debconf 8fa1862734fbe54d7178aaaa419f5a11 + /etc/debconf.conf 8c0619be413824f1fc7698cee0f23811 +Description: Debian configuration management system + Debconf is a configuration management system for debian packages. Packages + use Debconf to ask questions when they are installed. +Python-Version: 2.6, 3.1 diff --git a/tests/test_debfile.py b/tests/test_debfile.py index 6af0cf1c..c71c34a3 100644 --- a/tests/test_debfile.py +++ b/tests/test_debfile.py @@ -46,14 +46,14 @@ class TestDebfilee(unittest.TestCase): def setUp(self): apt_pkg.config.set("APT::Architecture","i386") apt_pkg.config.set("Dir::State::status", - "./test_debs/var/lib/dpkg/status") + "./data/test_debs/var/lib/dpkg/status") self.cache = apt.Cache() def testDebFile(self): deb = apt.debfile.DebPackage(cache=self.cache) for (filename, expected_res) in self.TEST_DEBS: logging.debug("testing %s, expecting %s" % (filename, expected_res)) - deb.open(os.path.join("test_debs", filename)) + deb.open(os.path.join("data", "test_debs", filename)) res = deb.check() self.assertEqual(res, expected_res, "Unexpected result for package '%s' (got %s wanted %s)" % ( diff --git a/tests/test_debs/gdebi-test1.deb b/tests/test_debs/gdebi-test1.deb deleted file mode 100644 index ea9991ac..00000000 Binary files a/tests/test_debs/gdebi-test1.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test10.deb b/tests/test_debs/gdebi-test10.deb deleted file mode 100644 index ca43ace6..00000000 Binary files a/tests/test_debs/gdebi-test10.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test2.deb b/tests/test_debs/gdebi-test2.deb deleted file mode 100644 index 307ac689..00000000 Binary files a/tests/test_debs/gdebi-test2.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test3.deb b/tests/test_debs/gdebi-test3.deb deleted file mode 100644 index 436b9258..00000000 Binary files a/tests/test_debs/gdebi-test3.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test4.deb b/tests/test_debs/gdebi-test4.deb deleted file mode 100644 index 9eb92d1b..00000000 Binary files a/tests/test_debs/gdebi-test4.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test5.deb b/tests/test_debs/gdebi-test5.deb deleted file mode 100644 index 0c98c03f..00000000 Binary files a/tests/test_debs/gdebi-test5.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test6.deb b/tests/test_debs/gdebi-test6.deb deleted file mode 100644 index 8ceacadc..00000000 Binary files a/tests/test_debs/gdebi-test6.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test7.deb b/tests/test_debs/gdebi-test7.deb deleted file mode 100644 index c0414990..00000000 Binary files a/tests/test_debs/gdebi-test7.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test8.deb b/tests/test_debs/gdebi-test8.deb deleted file mode 100644 index 439f8ca7..00000000 Binary files a/tests/test_debs/gdebi-test8.deb and /dev/null differ diff --git a/tests/test_debs/gdebi-test9.deb b/tests/test_debs/gdebi-test9.deb deleted file mode 100644 index 9901d906..00000000 Binary files a/tests/test_debs/gdebi-test9.deb and /dev/null differ diff --git a/tests/test_debs/var/lib/dpkg/status b/tests/test_debs/var/lib/dpkg/status deleted file mode 100644 index 443262e1..00000000 --- a/tests/test_debs/var/lib/dpkg/status +++ /dev/null @@ -1,77 +0,0 @@ -Package: apt -Status: hold ok installed -Priority: important -Section: admin -Installed-Size: 5456 -Maintainer: APT Development Team -Architecture: i386 -Version: 0.7.25.3 -Replaces: libapt-pkg-dev (<< 0.3.7), libapt-pkg-doc (<< 0.3.7) -Provides: libapt-pkg-libc6.10-6-4.8 -Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Conffiles: - /etc/cron.daily/apt 3528ddf873535d4c268d83e73e85dc79 - /etc/apt/apt.conf.d/01autoremove 6154750d39a78704b5bbf6fafd65ada7 - /etc/logrotate.d/apt 179f2ed4f85cbaca12fa3d69c2a4a1c3 - /etc/apt/apt.conf.d/01ubuntu 078b96538a377743bee0f554eb5b2fc6 obsolete -Description: Advanced front-end for dpkg - This is Debian's next generation front-end for the dpkg package manager. - It provides the apt-get utility and APT dselect method that provides a - simpler, safer way to install and upgrade packages. - . - APT features complete installation ordering, multiple source capability - and several other unique features, see the Users Guide in apt-doc. - -Package: postfix -Status: install ok installed -Priority: extra -Section: mail -Installed-Size: 3488 -Maintainer: LaMont Jones -Architecture: i386 -Version: 2.7.0-1 -Replaces: mail-transport-agent, postfix-tls -Provides: default-mta, mail-transport-agent, postfix-tls -Recommends: python -Suggests: procmail, postfix-mysql, postfix-pgsql, postfix-ldap, postfix-pcre, sasl2-bin, libsasl2-modules, resolvconf, postfix-cdb, mail-reader, ufw -Conflicts: libnss-db (<< 2.2-3), mail-transport-agent, postfix-tls, smail -Conffiles: - /etc/init.d/postfix e47d7ef0cbd2e212324812d74c409d77 - /etc/ppp/ip-up.d/postfix fccc53fc4eeeab46941ebcc95a71e766 - /etc/ppp/ip-down.d/postfix 52275dc23864f3bfca412c7558e28fe6 - /etc/network/if-up.d/postfix fccc53fc4eeeab46941ebcc95a71e766 - /etc/network/if-down.d/postfix 52275dc23864f3bfca412c7558e28fe6 - /etc/postfix/postfix-script 0d01860b2f0778cf41951c801f538b30 - /etc/postfix/post-install d53706c232f6497539fa0c99df674b33 - /etc/postfix/postfix-files 47e63262ab84069c840556b469b0fb2f - /etc/rsyslog.d/postfix.conf d8a09827fff2a22311e4dd4a83e95c83 - /etc/ufw/applications.d/postfix 6716a7729145a40bf7cb721c8dc6c3b0 - /etc/resolvconf/update-libc.d/postfix 6c80adbe120bc46cbf42658a7364e17f -Description: High-performance mail transport agent - Postfix is Wietse Venema's mail transport agent that started life as an - alternative to the widely-used Sendmail program. Postfix attempts to - be fast, easy to administer, and secure, while at the same time being - sendmail compatible enough to not upset existing users. Thus, the outside - has a sendmail-ish flavor, but the inside is completely different. - -Package: debconf -Status: install ok installed -Priority: important -Section: admin -Installed-Size: 924 -Maintainer: Debconf Developers -Architecture: all -Version: 1.5.28 -Replaces: debconf-tiny -Provides: debconf-2.0 -Recommends: apt-utils (>= 0.5.1) -Suggests: debconf-doc, debconf-utils, whiptail | dialog | gnome-utils, libterm-readline-gnu-perl, libgnome2-perl, libnet-ldap-perl, perl -Conflicts: apt (<< 0.3.12.1), cdebconf (<< 0.96), debconf-tiny, debconf-utils (<< 1.3.22), dialog (<< 0.9b-20020814-1), menu (<= 2.1.3-1), whiptail (<< 0.51.4-11), whiptail-utf8 (<= 0.50.17-13) -Conffiles: - /etc/apt/apt.conf.d/70debconf 7e9d09d5801a42b4926b736b8eeabb73 - /etc/bash_completion.d/debconf 8fa1862734fbe54d7178aaaa419f5a11 - /etc/debconf.conf 8c0619be413824f1fc7698cee0f23811 -Description: Debian configuration management system - Debconf is a configuration management system for debian packages. Packages - use Debconf to ask questions when they are installed. -Python-Version: 2.6, 3.1 -- cgit v1.2.3