- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (contrib/.cvsignore etc/abs/supfile.testing)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 02:45:15 Author: dan Path: /home/cvs-pacman/pacman-lib Added: contrib/.cvsignore (1.1) Modified: etc/abs/supfile.testing (1.1 -> 1.2) * added contrib/.cvsignore, and slight change to supfile.testing -------------------------+ contrib/.cvsignore | 2 ++ etc/abs/supfile.testing | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) Index: pacman-lib/contrib/.cvsignore diff -u /dev/null pacman-lib/contrib/.cvsignore:1.1 --- /dev/null Fri Feb 23 02:45:15 2007 +++ pacman-lib/contrib/.cvsignore Fri Feb 23 02:45:15 2007 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: pacman-lib/etc/abs/supfile.testing diff -u pacman-lib/etc/abs/supfile.testing:1.1 pacman-lib/etc/abs/supfile.testing:1.2 --- pacman-lib/etc/abs/supfile.testing:1.1 Tue Dec 5 02:30:15 2006 +++ pacman-lib/etc/abs/supfile.testing Fri Feb 23 02:45:15 2007 @@ -1,5 +1,5 @@ # -# /etc/abs/supfile +# /etc/abs/supfile.testing # # this is the host containing the master ABS files

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (remove020.py remove021.py)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 02:04:12 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Modified: remove020.py (1.2 -> 1.3) remove021.py (1.2 -> 1.3) * Oops. Messed a few things up, fixing them now. --------------+ remove020.py | 2 +- remove021.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/pactest/tests/remove020.py diff -u pacman-lib/pactest/tests/remove020.py:1.2 pacman-lib/pactest/tests/remove020.py:1.3 --- pacman-lib/pactest/tests/remove020.py:1.2 Fri Feb 23 01:50:42 2007 +++ pacman-lib/pactest/tests/remove020.py Fri Feb 23 02:04:12 2007 @@ -5,7 +5,7 @@ p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-R %s" % p1.name +self.args = "-Rn %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") Index: pacman-lib/pactest/tests/remove021.py diff -u pacman-lib/pactest/tests/remove021.py:1.2 pacman-lib/pactest/tests/remove021.py:1.3 --- pacman-lib/pactest/tests/remove021.py:1.2 Fri Feb 23 01:50:42 2007 +++ pacman-lib/pactest/tests/remove021.py Fri Feb 23 02:04:12 2007 @@ -5,7 +5,7 @@ p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-R %s" % p1.name +self.args = "-Rn %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy")

1 0

[pacman-dev] CVS update of pacman-lib/pactest (47 files)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 01:50:43 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest Added: tests/upgrade041.py (1.1) Modified: pmenv.py (1.4 -> 1.5) tests/TESTS (1.1 -> 1.2) tests/add001.py (1.1 -> 1.2) tests/add002.py (1.1 -> 1.2) tests/add003.py (1.1 -> 1.2) tests/add004.py (1.1 -> 1.2) tests/add020.py (1.1 -> 1.2) tests/add021.py (1.1 -> 1.2) tests/add032.py (1.1 -> 1.2) tests/add040.py (1.1 -> 1.2) tests/add042.py (1.1 -> 1.2) tests/add050.py (1.1 -> 1.2) tests/dummy001.py (1.1 -> 1.2) tests/query001.py (1.1 -> 1.2) tests/remove010.py (1.1 -> 1.2) tests/remove011.py (1.1 -> 1.2) tests/remove020.py (1.1 -> 1.2) tests/remove021.py (1.1 -> 1.2) tests/remove030.py (1.1 -> 1.2) tests/smoke001.py (1.1 -> 1.2) tests/sync001.py (1.1 -> 1.2) tests/sync002.py (1.1 -> 1.2) tests/sync003.py (1.1 -> 1.2) tests/sync009.py (1.1 -> 1.2) tests/sync010.py (1.1 -> 1.2) tests/sync020.py (1.1 -> 1.2) tests/sync021.py (1.1 -> 1.2) tests/sync040.py (1.1 -> 1.2) tests/sync041.py (1.1 -> 1.2) tests/sync042.py (1.1 -> 1.2) tests/sync043.py (1.1 -> 1.2) tests/sync050.py (1.1 -> 1.2) tests/sync103.py (1.1 -> 1.2) tests/sync200.py (1.1 -> 1.2) tests/sync890.py (1.1 -> 1.2) tests/sync891.py (1.1 -> 1.2) tests/sync892.py (1.1 -> 1.2) tests/sync893.py (1.1 -> 1.2) tests/sync897.py (1.2 -> 1.3) tests/sync898.py (1.2 -> 1.3) tests/sync990.py (1.1 -> 1.2) tests/sync992.py (1.1 -> 1.2) tests/upgrade003.py (1.1 -> 1.2) tests/upgrade020.py (1.1 -> 1.2) tests/upgrade030.py (1.1 -> 1.2) tests/upgrade040.py (1.1 -> 1.2) * Changes to quite a few of the tests, mostly minimal changes (better descriptions, additional rules, etc) * One new pactest test regarding file migration between packages. * Fix of a little output bug in pmenv.py ---------------------+ pmenv.py | 2 +- tests/TESTS | 2 ++ tests/add001.py | 2 +- tests/add002.py | 2 +- tests/add003.py | 2 +- tests/add004.py | 8 +++++++- tests/add020.py | 2 +- tests/add021.py | 2 +- tests/add032.py | 2 +- tests/add040.py | 2 +- tests/add042.py | 8 ++++---- tests/add050.py | 1 + tests/dummy001.py | 4 +++- tests/query001.py | 3 ++- tests/remove010.py | 5 +++-- tests/remove011.py | 5 +++-- tests/remove020.py | 5 +++-- tests/remove021.py | 5 +++-- tests/remove030.py | 3 ++- tests/smoke001.py | 4 ++++ tests/sync001.py | 3 ++- tests/sync002.py | 3 ++- tests/sync003.py | 3 ++- tests/sync009.py | 3 ++- tests/sync010.py | 11 +++++++---- tests/sync020.py | 2 +- tests/sync021.py | 2 +- tests/sync040.py | 4 ++-- tests/sync041.py | 2 +- tests/sync042.py | 2 +- tests/sync043.py | 14 +++++++++----- tests/sync050.py | 3 ++- tests/sync103.py | 3 +-- tests/sync200.py | 2 +- tests/sync890.py | 2 +- tests/sync891.py | 2 +- tests/sync892.py | 2 +- tests/sync893.py | 4 ++-- tests/sync897.py | 2 +- tests/sync898.py | 4 ++-- tests/sync990.py | 2 +- tests/sync992.py | 2 +- tests/upgrade003.py | 2 +- tests/upgrade020.py | 2 +- tests/upgrade030.py | 1 - tests/upgrade040.py | 7 ++++++- tests/upgrade041.py | 30 ++++++++++++++++++++++++++++++ 47 files changed, 127 insertions(+), 61 deletions(-) Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.4 pacman-lib/pactest/pmenv.py:1.5 --- pacman-lib/pactest/pmenv.py:1.4 Fri Feb 23 00:11:43 2007 +++ pacman-lib/pactest/pmenv.py Fri Feb 23 01:50:42 2007 @@ -100,7 +100,7 @@ passed += 1 else: print "[FAILED]", - print test.name.strip(".py").ljust(33), + print test.name.replace(".py", "").ljust(33), print "Rules:", print "OK = %2u FAIL = %2u SKIP = %2u" % \ (success, fail, rules - (success + fail)) Index: pacman-lib/pactest/tests/TESTS diff -u pacman-lib/pactest/tests/TESTS:1.1 pacman-lib/pactest/tests/TESTS:1.2 --- pacman-lib/pactest/tests/TESTS:1.1 Sun Oct 15 15:04:28 2006 +++ pacman-lib/pactest/tests/TESTS Fri Feb 23 01:50:42 2007 @@ -1,3 +1,5 @@ +TODO: this is really outdated, needs regeneration (after we rename tests) + add001: Install a package add002: Install a package (already installed) add003: Install a set of packages Index: pacman-lib/pactest/tests/add001.py diff -u pacman-lib/pactest/tests/add001.py:1.1 pacman-lib/pactest/tests/add001.py:1.2 --- pacman-lib/pactest/tests/add001.py:1.1 Sun Oct 15 15:04:28 2006 +++ pacman-lib/pactest/tests/add001.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a package" +self.description = "Install a simple package with two files" p = pmpkg("dummy") p.files = ["bin/dummy", Index: pacman-lib/pactest/tests/add002.py diff -u pacman-lib/pactest/tests/add002.py:1.1 pacman-lib/pactest/tests/add002.py:1.2 --- pacman-lib/pactest/tests/add002.py:1.1 Sun Oct 15 15:04:28 2006 +++ pacman-lib/pactest/tests/add002.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a package (already installed)" +self.description = "Install an already-installed package" lp = pmpkg("dummy") lp.files = ["bin/dummy", Index: pacman-lib/pactest/tests/add003.py diff -u pacman-lib/pactest/tests/add003.py:1.1 pacman-lib/pactest/tests/add003.py:1.2 --- pacman-lib/pactest/tests/add003.py:1.1 Sun Oct 15 15:04:28 2006 +++ pacman-lib/pactest/tests/add003.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a set of packages" +self.description = "Install a set of three packages" p1 = pmpkg("pkg1") p1.files = ["bin/pkg1", Index: pacman-lib/pactest/tests/add004.py diff -u pacman-lib/pactest/tests/add004.py:1.1 pacman-lib/pactest/tests/add004.py:1.2 --- pacman-lib/pactest/tests/add004.py:1.1 Sun Oct 15 15:04:28 2006 +++ pacman-lib/pactest/tests/add004.py Fri Feb 23 01:50:42 2007 @@ -1,8 +1,12 @@ -self.description = "Install a set of the same package at different versions" +self.description = "Install three of the same package at different versions" p1 = pmpkg("dummy", "1.0-2") +p1.files = ["bin/dummy"] p2 = pmpkg("dummy", "2.0-1") +p2.files = ["bin/dummy"] p3 = pmpkg("dummy") +p3.files = ["bin/dummy"] + for p in p1, p2, p3: self.addpkg(p) @@ -10,3 +14,5 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|2.0-1") +for f in p2.files: + self.addrule("FILE_EXIST=%s" % f) Index: pacman-lib/pactest/tests/add020.py diff -u pacman-lib/pactest/tests/add020.py:1.1 pacman-lib/pactest/tests/add020.py:1.2 --- pacman-lib/pactest/tests/add020.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/add020.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a package with an existing file" +self.description = "Install a package with an existing file (--force)" p = pmpkg("dummy") p.files = ["etc/dummy.conf"] Index: pacman-lib/pactest/tests/add021.py diff -u pacman-lib/pactest/tests/add021.py:1.1 pacman-lib/pactest/tests/add021.py:1.2 --- pacman-lib/pactest/tests/add021.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/add021.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a package with an existing file (new modified)" +self.description = "Install a package with an existing file (--force, new modified)" p = pmpkg("dummy") p.files = ["etc/dummy.conf*"] Index: pacman-lib/pactest/tests/add032.py diff -u pacman-lib/pactest/tests/add032.py:1.1 pacman-lib/pactest/tests/add032.py:1.2 --- pacman-lib/pactest/tests/add032.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/add032.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Freshen a package (installed is newer)" +self.description = "Freshen a package (installed is same)" lp = pmpkg("dummy") lp.files = ["bin/dummy", Index: pacman-lib/pactest/tests/add040.py diff -u pacman-lib/pactest/tests/add040.py:1.1 pacman-lib/pactest/tests/add040.py:1.2 --- pacman-lib/pactest/tests/add040.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/add040.py Fri Feb 23 01:50:42 2007 @@ -3,7 +3,7 @@ p = pmpkg("dummy") p.files = ["bin/dummy", "usr/man/man1/dummy.1"] -p.depends = ["missdep"] +p.depends = ["dep1"] self.addpkg(p) self.args = "-A %s" % p.filename() Index: pacman-lib/pactest/tests/add042.py diff -u pacman-lib/pactest/tests/add042.py:1.1 pacman-lib/pactest/tests/add042.py:1.2 --- pacman-lib/pactest/tests/add042.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/add042.py Fri Feb 23 01:50:42 2007 @@ -19,11 +19,11 @@ self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") -for f in p1.files: - self.addrule("FILE_EXIST=%s" % f) -self.addrule("PKG_EXIST=dep1") -self.addrule("PKG_EXIST=dep2") self.addrule("PKG_DEPENDS=dummy|dep1") self.addrule("PKG_DEPENDS=dep1|dep2") self.addrule("PKG_REQUIREDBY=dep1|dummy") self.addrule("PKG_REQUIREDBY=dep2|dep1") +for p in p1, p2, p3: + self.addrule("PKG_EXIST=%s" % p.name) + for f in p.files: + self.addrule("FILE_EXIST=%s" % f) Index: pacman-lib/pactest/tests/add050.py diff -u pacman-lib/pactest/tests/add050.py:1.1 pacman-lib/pactest/tests/add050.py:1.2 --- pacman-lib/pactest/tests/add050.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/add050.py Fri Feb 23 01:50:42 2007 @@ -2,6 +2,7 @@ p = pmpkg("dummy") p.files = ["etc/dummy.conf"] +p.backup = ["etc/dummy.conf"] self.addpkg(p) self.filesystem = ["etc/dummy.conf"] Index: pacman-lib/pactest/tests/dummy001.py diff -u pacman-lib/pactest/tests/dummy001.py:1.1 pacman-lib/pactest/tests/dummy001.py:1.2 --- pacman-lib/pactest/tests/dummy001.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/dummy001.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "dummy test case" +self.description = "Dummy test case (modify for own use)" p1 = pmpkg("dummy") p1.files = ["etc/dummy.conf*", @@ -17,3 +17,5 @@ #self.addpkg(p2) self.args = "-U %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=0") Index: pacman-lib/pactest/tests/query001.py diff -u pacman-lib/pactest/tests/query001.py:1.1 pacman-lib/pactest/tests/query001.py:1.2 --- pacman-lib/pactest/tests/query001.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/query001.py Fri Feb 23 01:50:42 2007 @@ -4,6 +4,7 @@ p.files = ["bin/foobar"] self.addpkg2db("local", p) -self.args = "-Q foobar" +self.args = "-Q %s" % p.name +self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=foobar") Index: pacman-lib/pactest/tests/remove010.py diff -u pacman-lib/pactest/tests/remove010.py:1.1 pacman-lib/pactest/tests/remove010.py:1.2 --- pacman-lib/pactest/tests/remove010.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/remove010.py Fri Feb 23 01:50:42 2007 @@ -1,12 +1,13 @@ -self.description = "Remove a package, with a file marked for backup" +self.description = "Remove a package with a file marked for backup" p1 = pmpkg("dummy") p1.files = ["etc/dummy.conf"] p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-R dummy" +self.args = "-R %s" % p1.name +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") self.addrule("!FILE_EXIST=etc/dummy.conf") self.addrule("FILE_PACSAVE=etc/dummy.conf") Index: pacman-lib/pactest/tests/remove011.py diff -u pacman-lib/pactest/tests/remove011.py:1.1 pacman-lib/pactest/tests/remove011.py:1.2 --- pacman-lib/pactest/tests/remove011.py:1.1 Sun Oct 15 15:04:29 2006 +++ pacman-lib/pactest/tests/remove011.py Fri Feb 23 01:50:42 2007 @@ -1,12 +1,13 @@ -self.description = "Remove a package, with a modified file marked for backup" +self.description = "Remove a package with a modified file marked for backup" p1 = pmpkg("dummy") p1.files = ["etc/dummy.conf*"] p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-R dummy" +self.args = "-R %s" % p1.name +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") self.addrule("!FILE_EXIST=etc/dummy.conf") self.addrule("FILE_PACSAVE=etc/dummy.conf") Index: pacman-lib/pactest/tests/remove020.py diff -u pacman-lib/pactest/tests/remove020.py:1.1 pacman-lib/pactest/tests/remove020.py:1.2 --- pacman-lib/pactest/tests/remove020.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/remove020.py Fri Feb 23 01:50:42 2007 @@ -1,12 +1,13 @@ -self.description = "Remove a package, with a file marked for backup (--nosave)" +self.description = "Remove a package with a file marked for backup (--nosave)" p1 = pmpkg("dummy") p1.files = ["etc/dummy.conf"] p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-Rn dummy" +self.args = "-R %s" % p1.name +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") self.addrule("!FILE_EXIST=etc/dummy.conf") self.addrule("!FILE_PACSAVE=etc/dummy.conf") Index: pacman-lib/pactest/tests/remove021.py diff -u pacman-lib/pactest/tests/remove021.py:1.1 pacman-lib/pactest/tests/remove021.py:1.2 --- pacman-lib/pactest/tests/remove021.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/remove021.py Fri Feb 23 01:50:42 2007 @@ -1,12 +1,13 @@ -self.description = "Remove a package, with a modified file marked for backup (--nosave)" +self.description = "Remove a package with a modified file marked for backup (--nosave)" p1 = pmpkg("dummy") p1.files = ["etc/dummy.conf*"] p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-Rn dummy" +self.args = "-R %s" % p1.name +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") self.addrule("!FILE_EXIST=etc/dummy.conf") self.addrule("!FILE_PACSAVE=etc/dummy.conf") Index: pacman-lib/pactest/tests/remove030.py diff -u pacman-lib/pactest/tests/remove030.py:1.1 pacman-lib/pactest/tests/remove030.py:1.2 --- pacman-lib/pactest/tests/remove030.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/remove030.py Fri Feb 23 01:50:42 2007 @@ -5,8 +5,9 @@ self.option["holdpkg"] = ["dummy"] -self.args = "-R dummy" +self.args = "-R %s" % p1.name +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") self.addrule("!FILE_EXIST=etc/dummy.conf") self.addrule("!FILE_PACSAVE=etc/dummy.conf") Index: pacman-lib/pactest/tests/smoke001.py diff -u pacman-lib/pactest/tests/smoke001.py:1.1 pacman-lib/pactest/tests/smoke001.py:1.2 --- pacman-lib/pactest/tests/smoke001.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/smoke001.py Fri Feb 23 01:50:42 2007 @@ -17,3 +17,7 @@ self.addrule("PACMAN_RETCODE=0") #for i in range(1000): # self.addrule("PKG_EXIST=pkg%03d" %i) +# picked 3 random packages to test for, since the loop is too much to handle +self.addrule("PKG_EXIST=pkg050") +self.addrule("PKG_EXIST=pkg674") +self.addrule("PKG_EXIST=pkg999") Index: pacman-lib/pactest/tests/sync001.py diff -u pacman-lib/pactest/tests/sync001.py:1.1 pacman-lib/pactest/tests/sync001.py:1.2 --- pacman-lib/pactest/tests/sync001.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync001.py Fri Feb 23 01:50:42 2007 @@ -5,8 +5,9 @@ "usr/man/man1/dummy.1"] self.addpkg2db("sync", sp) -self.args = "-S dummy" +self.args = "-S %s" % sp.name +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=dummy") for f in sp.files: self.addrule("FILE_EXIST=%s" % f) Index: pacman-lib/pactest/tests/sync002.py diff -u pacman-lib/pactest/tests/sync002.py:1.1 pacman-lib/pactest/tests/sync002.py:1.2 --- pacman-lib/pactest/tests/sync002.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync002.py Fri Feb 23 01:50:42 2007 @@ -10,8 +10,9 @@ "usr/man/man1/dummy.1"] self.addpkg2db("local", lp) -self.args = "-S dummy" +self.args = "-S %s" % sp.name +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") for f in lp.files: self.addrule("FILE_MODIFIED=%s" % f) Index: pacman-lib/pactest/tests/sync003.py diff -u pacman-lib/pactest/tests/sync003.py:1.1 pacman-lib/pactest/tests/sync003.py:1.2 --- pacman-lib/pactest/tests/sync003.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync003.py Fri Feb 23 01:50:42 2007 @@ -7,6 +7,7 @@ self.filesystem = ["bin/dummy"] -self.args = "-S dummy" +self.args = "-S %s" % sp.name +self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=dummy") Index: pacman-lib/pactest/tests/sync009.py diff -u pacman-lib/pactest/tests/sync009.py:1.1 pacman-lib/pactest/tests/sync009.py:1.2 --- pacman-lib/pactest/tests/sync009.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync009.py Fri Feb 23 01:50:42 2007 @@ -5,8 +5,9 @@ "usr/man/man1/dummy.1"] self.addpkg2db("sync", sp) -self.args = "-S dummy" +self.args = "-S %s" % sp.name +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=dummy") for f in sp.files: self.addrule("FILE_EXIST=%s" % f) Index: pacman-lib/pactest/tests/sync010.py diff -u pacman-lib/pactest/tests/sync010.py:1.1 pacman-lib/pactest/tests/sync010.py:1.2 --- pacman-lib/pactest/tests/sync010.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync010.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a package from a sync db, with its dependencies" +self.description = "Install a package from a sync db with cascaded dependencies" sp1 = pmpkg("dummy", "1.0-2") sp1.files = ["bin/dummy", @@ -15,12 +15,15 @@ for p in sp1, sp2, sp3: self.addpkg2db("sync", p); -self.args = "-S dummy" +self.args = "-S %s" % sp1.name +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") self.addrule("PKG_DEPENDS=dummy|dep1") -for f in sp1.files: - self.addrule("FILE_EXIST=%s" % f) +for p in sp1, sp2, sp3: + self.addrule("PKG_EXIST=%s" % p.name) + for f in p.files: + self.addrule("FILE_EXIST=%s" % f) self.addrule("PKG_DEPENDS=dep1|dep2") self.addrule("PKG_REQUIREDBY=dep1|dummy") self.addrule("PKG_REQUIREDBY=dep2|dep1") Index: pacman-lib/pactest/tests/sync020.py diff -u pacman-lib/pactest/tests/sync020.py:1.1 pacman-lib/pactest/tests/sync020.py:1.2 --- pacman-lib/pactest/tests/sync020.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync020.py Fri Feb 23 01:50:42 2007 @@ -12,7 +12,7 @@ for p in sp1, sp2, sp3: self.addpkg2db("sync", p); -self.args = "-S grp" +self.args = "-S %s" % "grp" self.addrule("PACMAN_RETCODE=0") for p in sp1, sp2, sp3: Index: pacman-lib/pactest/tests/sync021.py diff -u pacman-lib/pactest/tests/sync021.py:1.1 pacman-lib/pactest/tests/sync021.py:1.2 --- pacman-lib/pactest/tests/sync021.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync021.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install a group from a sync db, with a package in IgnorePkg" +self.description = "Install a group from a sync db with a package in IgnorePkg" sp1 = pmpkg("pkg1") sp1.groups = ["grp"] Index: pacman-lib/pactest/tests/sync040.py diff -u pacman-lib/pactest/tests/sync040.py:1.1 pacman-lib/pactest/tests/sync040.py:1.2 --- pacman-lib/pactest/tests/sync040.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync040.py Fri Feb 23 01:50:42 2007 @@ -1,4 +1,4 @@ -self.description = "Install two targets with a conflict" +self.description = "Install two targets from a sync db with a conflict" sp1 = pmpkg("pkg1") sp1.conflicts = ["pkg2"] @@ -8,7 +8,7 @@ for p in sp1, sp2: self.addpkg2db("sync", p); -self.args = "-S pkg1 pkg2" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=1") for p in sp1, sp2: Index: pacman-lib/pactest/tests/sync041.py diff -u pacman-lib/pactest/tests/sync041.py:1.1 pacman-lib/pactest/tests/sync041.py:1.2 --- pacman-lib/pactest/tests/sync041.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync041.py Fri Feb 23 01:50:43 2007 @@ -9,7 +9,7 @@ for p in sp1, sp2: self.addpkg2db("sync", p); -self.args = "-S pkg1 pkg2" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync042.py diff -u pacman-lib/pactest/tests/sync042.py:1.1 pacman-lib/pactest/tests/sync042.py:1.2 --- pacman-lib/pactest/tests/sync042.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync042.py Fri Feb 23 01:50:43 2007 @@ -7,7 +7,7 @@ lp = pmpkg("pkg2") self.addpkg2db("local", lp); -self.args = "-S pkg1" +self.args = "-S %s" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync043.py diff -u pacman-lib/pactest/tests/sync043.py:1.1 pacman-lib/pactest/tests/sync043.py:1.2 --- pacman-lib/pactest/tests/sync043.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync043.py Fri Feb 23 01:50:43 2007 @@ -1,14 +1,18 @@ -self.description = "Install a sync package conflicting with a local one" +self.description = "Install a sync package conflicting with two local ones" sp = pmpkg("pkg1") -sp.conflicts = ["pkg2"] +sp.conflicts = ["pkg2", "pkg3"] self.addpkg2db("sync", sp); -lp = pmpkg("pkg2") -self.addpkg2db("local", lp); +lp1 = pmpkg("pkg2") +self.addpkg2db("local", lp1); -self.args = "-S pkg1" +lp1 = pmpkg("pkg3") +self.addpkg2db("local", lp1); + +self.args = "-S %s" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("!PKG_EXIST=pkg3") Index: pacman-lib/pactest/tests/sync050.py diff -u pacman-lib/pactest/tests/sync050.py:1.1 pacman-lib/pactest/tests/sync050.py:1.2 --- pacman-lib/pactest/tests/sync050.py:1.1 Sun Oct 15 15:04:30 2006 +++ pacman-lib/pactest/tests/sync050.py Fri Feb 23 01:50:43 2007 @@ -4,7 +4,8 @@ sp1.provides = ["pkg2"] self.addpkg2db("sync", sp1); -self.args = "-S pkg2" +self.args = "-S %s" % sp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/sync103.py diff -u pacman-lib/pactest/tests/sync103.py:1.1 pacman-lib/pactest/tests/sync103.py:1.2 --- pacman-lib/pactest/tests/sync103.py:1.1 Sun Oct 15 15:04:31 2006 +++ pacman-lib/pactest/tests/sync103.py Fri Feb 23 01:50:43 2007 @@ -1,14 +1,13 @@ self.description = "Sysupgrade with a local package not existing in sync db" sp = pmpkg("spkg") - self.addpkg2db("sync", sp) lp = pmpkg("lpkg") - self.addpkg2db("local", lp) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_MODIFIED=lpkg") +self.addrule("!PKG_EXIST=spkg") Index: pacman-lib/pactest/tests/sync200.py diff -u pacman-lib/pactest/tests/sync200.py:1.1 pacman-lib/pactest/tests/sync200.py:1.2 --- pacman-lib/pactest/tests/sync200.py:1.1 Sun Oct 15 15:04:31 2006 +++ pacman-lib/pactest/tests/sync200.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "Synchronize database" +self.description = "Synchronize the local database" sp1 = pmpkg("spkg1", "1.0-1") sp1.depends = ["spkg2"] Index: pacman-lib/pactest/tests/sync890.py diff -u pacman-lib/pactest/tests/sync890.py:1.1 pacman-lib/pactest/tests/sync890.py:1.2 --- pacman-lib/pactest/tests/sync890.py:1.1 Sun Oct 15 15:04:31 2006 +++ pacman-lib/pactest/tests/sync890.py Fri Feb 23 01:50:43 2007 @@ -12,7 +12,7 @@ for p in lp1, lp2: self.addpkg2db("local", p) -self.args = "-S pkg3" +self.args = "-S %s" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync891.py diff -u pacman-lib/pactest/tests/sync891.py:1.1 pacman-lib/pactest/tests/sync891.py:1.2 --- pacman-lib/pactest/tests/sync891.py:1.1 Sun Oct 15 15:04:31 2006 +++ pacman-lib/pactest/tests/sync891.py Fri Feb 23 01:50:43 2007 @@ -14,7 +14,7 @@ for p in lp1, lp2: self.addpkg2db("local", p) -self.args = "-S pkg2 pkg3" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync892.py diff -u pacman-lib/pactest/tests/sync892.py:1.1 pacman-lib/pactest/tests/sync892.py:1.2 --- pacman-lib/pactest/tests/sync892.py:1.1 Sun Oct 15 15:04:32 2006 +++ pacman-lib/pactest/tests/sync892.py Fri Feb 23 01:50:43 2007 @@ -16,7 +16,7 @@ for p in lp1, lp2: self.addpkg2db("local", p) -self.args = "-S pkg2 pkg3" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync893.py diff -u pacman-lib/pactest/tests/sync893.py:1.1 pacman-lib/pactest/tests/sync893.py:1.2 --- pacman-lib/pactest/tests/sync893.py:1.1 Sun Oct 15 15:04:32 2006 +++ pacman-lib/pactest/tests/sync893.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "conflict (bug)" +self.description = "conflict 'db vs db'" sp1 = pmpkg("pkg1", "1.0-2") sp1.conflicts = ["pkg2"] @@ -13,7 +13,7 @@ lp2 = pmpkg("pkg2") self.addpkg2db("local", lp2) -self.args = "-S pkg1 pkg2" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync897.py diff -u pacman-lib/pactest/tests/sync897.py:1.2 pacman-lib/pactest/tests/sync897.py:1.3 --- pacman-lib/pactest/tests/sync897.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/tests/sync897.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "System upgrade" +self.description = "System upgrade with package conflicts" sp1 = pmpkg("pkg1", "1.0-2") sp1.conflicts = ["pkg2"] Index: pacman-lib/pactest/tests/sync898.py diff -u pacman-lib/pactest/tests/sync898.py:1.2 pacman-lib/pactest/tests/sync898.py:1.3 --- pacman-lib/pactest/tests/sync898.py:1.2 Sat Oct 21 16:04:36 2006 +++ pacman-lib/pactest/tests/sync898.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "System upgrade" +self.description = "System upgrade with conflicts and provides" sp1 = pmpkg("pkg1", "1.0-2") sp1.conflicts = ["pkg2"] @@ -11,7 +11,7 @@ lp1 = pmpkg("pkg1") self.addpkg2db("local", lp1) -self.args = "-S pkg1 pkg2" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_MODIFIED=pkg1") Index: pacman-lib/pactest/tests/sync990.py diff -u pacman-lib/pactest/tests/sync990.py:1.1 pacman-lib/pactest/tests/sync990.py:1.2 --- pacman-lib/pactest/tests/sync990.py:1.1 Sun Oct 15 15:04:32 2006 +++ pacman-lib/pactest/tests/sync990.py Fri Feb 23 01:50:43 2007 @@ -12,7 +12,7 @@ for p in sp1, sp2, sp3: self.addpkg2db("sync", p) -self.args = "-S pkg1 pkg2" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/sync992.py diff -u pacman-lib/pactest/tests/sync992.py:1.1 pacman-lib/pactest/tests/sync992.py:1.2 --- pacman-lib/pactest/tests/sync992.py:1.1 Sun Oct 15 15:04:32 2006 +++ pacman-lib/pactest/tests/sync992.py Fri Feb 23 01:50:43 2007 @@ -15,7 +15,7 @@ lp1 = pmpkg("pkg2", "0.1-1") self.addpkg2db("local", lp1) -self.args = "-S pkg1 pkg2" +self.args = "-S %s" % " ".join([p.name for p in sp1, sp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1") Index: pacman-lib/pactest/tests/upgrade003.py diff -u pacman-lib/pactest/tests/upgrade003.py:1.1 pacman-lib/pactest/tests/upgrade003.py:1.2 --- pacman-lib/pactest/tests/upgrade003.py:1.1 Sun Oct 15 15:04:32 2006 +++ pacman-lib/pactest/tests/upgrade003.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "Upgrade a package (lesser version)" +self.description = "Upgrade a package (older version)" lp = pmpkg("dummy", "1.0-2") lp.files = ["bin/dummy", Index: pacman-lib/pactest/tests/upgrade020.py diff -u pacman-lib/pactest/tests/upgrade020.py:1.1 pacman-lib/pactest/tests/upgrade020.py:1.2 --- pacman-lib/pactest/tests/upgrade020.py:1.1 Sun Oct 15 15:04:32 2006 +++ pacman-lib/pactest/tests/upgrade020.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "Upgrade a package, with a file in 'backup' (new modified)" +self.description = "Upgrade a package, with a file in 'backup' (local unchanged, new modified)" lp = pmpkg("dummy") lp.files = ["etc/dummy.conf"] Index: pacman-lib/pactest/tests/upgrade030.py diff -u pacman-lib/pactest/tests/upgrade030.py:1.1 pacman-lib/pactest/tests/upgrade030.py:1.2 --- pacman-lib/pactest/tests/upgrade030.py:1.1 Sun Oct 15 15:04:33 2006 +++ pacman-lib/pactest/tests/upgrade030.py Fri Feb 23 01:50:43 2007 @@ -15,7 +15,6 @@ self.addpkg(p) self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) -#self.args = "-Qi %s" % " ".join([p.name for p in lp1, lp2]) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_REASON=pkg1|0") Index: pacman-lib/pactest/tests/upgrade040.py diff -u pacman-lib/pactest/tests/upgrade040.py:1.1 pacman-lib/pactest/tests/upgrade040.py:1.2 --- pacman-lib/pactest/tests/upgrade040.py:1.1 Sun Oct 15 15:04:33 2006 +++ pacman-lib/pactest/tests/upgrade040.py Fri Feb 23 01:50:43 2007 @@ -1,4 +1,4 @@ -self.description = "file relocation 1" +self.description = "File relocation between two packages" lp1 = pmpkg("dummy") lp1.files = ["bin/dummy", @@ -23,3 +23,8 @@ self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) self.addrule("PACMAN_RETCODE=0") +for p in p1, p2: + self.addrule("PKG_EXIST=%s" % p.name) +self.addrule("FILE_MODIFIED=bin/dummy") +self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_MODIFIED=usr/share/file") Index: pacman-lib/pactest/tests/upgrade041.py diff -u /dev/null pacman-lib/pactest/tests/upgrade041.py:1.1 --- /dev/null Fri Feb 23 01:50:44 2007 +++ pacman-lib/pactest/tests/upgrade041.py Fri Feb 23 01:50:43 2007 @@ -0,0 +1,30 @@ +self.description = "File relocation between two packages (reverse order)" + +lp1 = pmpkg("dummy") +lp1.files = ["bin/dummy"] + +lp2 = pmpkg("foobar") +lp2.files = ["bin/foobar" + "usr/share/file"] + +for p in lp1, lp2: + self.addpkg2db("local", p) + +p1 = pmpkg("dummy") +p1.files = ["bin/dummy", + "usr/share/file"] + +p2 = pmpkg("foobar") +p2.files = ["bin/foobar"] + +for p in p1, p2: + self.addpkg(p) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") +for p in p1, p2: + self.addrule("PKG_EXIST=%s" % p.name) +self.addrule("FILE_MODIFIED=bin/dummy") +self.addrule("FILE_MODIFIED=bin/foobar") +self.addrule("FILE_MODIFIED=usr/share/file")

1 0

[pacman-dev] Possible PKGBUILD and pacman.install for upcoming release
by Dan McGee 23 Feb '07

23 Feb '07

These are here mostly for discussion, and eventually will form the real thing. Guys who have more of an outside view--what else needs to go in the pacman.install file? Let us know, please. PKGBUILD: # $Id$ # Maintainer: judd <jvinet(a)zeroflux.org> pkgname=pacman pkgver=3.0.0 pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" license=('GPL') makedepends=(doxygen) depends=(libarchive libdownload) replaces=(pacman-rc) backup=(etc/pacman.conf etc/makepkg.conf etc/abs/abs.conf \ etc/pacman.d/{current,release,extra,unstable,community}) install=pacman.install #source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz) source=(http://www.archlinux.org/~dan/pacman/$pkgname-$pkgver.tar.gz) md5sums=('c0983b855d3a3b3466520d01dc55aa08') sha1sums=('f1d63380c4897c2b42667dfef1c482a27e56aa21') build() { cd $startdir/src/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc make || return 1 make DESTDIR=$startdir/pkg install || return 1 } pacman.install: # arg 1: the new package version post_install() { echo ">>> PLEASE READ THE FOLLOWING!" echo ">>> Use of the new rankmirrors script on your /etc/pacman.d/ files is" echo ">>> highly recommended. Read rankmirrors --help for details. In" echo ">>> addition, mirrors are now listed by country, so move those that" echo ">>> are geographically close to you to the top." } # arg 1: the new package version # arg 2: the old package version post_upgrade() { echo ">>> PLEASE READ THE FOLLOWING!" if [ "$(vercmp $2 3.0.0)" -lt 0 ]; then echo ">>> The makepkg.conf syntax has changed, please note the new format" echo ">>> when merging the pacnew file with your old configuration." echo ">>>" fi echo ">>> Use of the new rankmirrors script on your /etc/pacman.d/ files is" echo ">>> highly recommended. Read rankmirrors --help for details. In" echo ">>> addition, mirrors are now listed by country, so move those that" echo ">>> are geographically close to you to the top." } op=$1 shift $op $*

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pactest.py)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 00:12:58 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.7 -> 1.8) Ignore that... wasn't supposed to happen ------------+ pactest.py | 1 - 1 file changed, 1 deletion(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.7 pacman-lib/pactest/pactest.py:1.8 --- pacman-lib/pactest/pactest.py:1.7 Fri Feb 23 00:11:43 2007 +++ pacman-lib/pactest/pactest.py Fri Feb 23 00:12:58 2007 @@ -40,7 +40,6 @@ globlist += glob.glob(parser.rargs[idx]) idx += 1 - print "tests: %s" % globlist parser.rargs = parser.rargs[idx:] setattr(parser.values, option.dest, globlist)

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pactest.py pmenv.py)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 00:11:43 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.6 -> 1.7) pmenv.py (1.3 -> 1.4) ------------+ pactest.py | 1 + pmenv.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.6 pacman-lib/pactest/pactest.py:1.7 --- pacman-lib/pactest/pactest.py:1.6 Thu Feb 22 23:54:49 2007 +++ pacman-lib/pactest/pactest.py Fri Feb 23 00:11:43 2007 @@ -40,6 +40,7 @@ globlist += glob.glob(parser.rargs[idx]) idx += 1 + print "tests: %s" % globlist parser.rargs = parser.rargs[idx:] setattr(parser.values, option.dest, globlist) Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.3 pacman-lib/pactest/pmenv.py:1.4 --- pacman-lib/pactest/pmenv.py:1.3 Wed Feb 21 02:13:16 2007 +++ pacman-lib/pactest/pmenv.py Fri Feb 23 00:11:43 2007 @@ -59,7 +59,7 @@ for t in self.testcases: print "=========="*8 - print "Running '%s'" % t.name.strip(".py") + print "Running '%s'" % t.name.replace(".py", "") t.load() print t.description

1 0

[pacman-dev] CVS update of pacman-lib (3 files)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 23:54:49 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.16 -> 1.17) pactest/pactest.py (1.5 -> 1.6) pactest/pmtest.py (1.3 -> 1.4) * Fixed globbing for pactest --test argument * --manual-confirm was handled in the wrong order --------------------+ Makefile.am | 2 +- pactest/pactest.py | 14 ++++++++++---- pactest/pmtest.py | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.16 pacman-lib/Makefile.am:1.17 --- pacman-lib/Makefile.am:1.16 Thu Feb 22 21:00:30 2007 +++ pacman-lib/Makefile.am Thu Feb 22 23:54:49 2007 @@ -9,6 +9,6 @@ # TODO : figure out a way to get 'make distcheck' to build with # --disable-fakeroot so it actually passes tests check-local: src/pacman - python $(top_srcdir)/pactest/pactest.py --test=$(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1 + python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1 rm -rf $(top_builddir)/root Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.5 pacman-lib/pactest/pactest.py:1.6 --- pacman-lib/pactest/pactest.py:1.5 Thu Feb 22 23:22:21 2007 +++ pacman-lib/pactest/pactest.py Thu Feb 22 23:54:49 2007 @@ -32,13 +32,20 @@ setattr(parser.values, option.dest, os.path.abspath(value)) def globTests(option, opt_str, value, parser): + idx=0 globlist = [] - globlist.extend(glob.glob(value)) + + # maintain the idx so we can modify rargs + while not parser.rargs[idx].startswith('-'): + globlist += glob.glob(parser.rargs[idx]) + idx += 1 + + parser.rargs = parser.rargs[idx:] setattr(parser.values, option.dest, globlist) def createOptParser(): testcases = [] - usage = "usage: %prog [options] [[--test=<path/to/testfile.py>] ...]" + usage = "usage: %prog [options] [[--test <path/to/testfile.py>] ...]" description = "Runs automated tests on the pacman binary. Tests are " \ "described using an easy python syntax, and several can be " \ "ran at once." @@ -55,8 +62,7 @@ dest = "bin", default = "pacman", help = "specify location of the pacman binary") parser.add_option("-t", "--test", action = "callback", - callback = globTests, type = "string", - dest = "testcases", + callback = globTests, dest = "testcases", help = "specify test case(s)") parser.add_option("--nolog", action = "store_true", dest = "nolog", default = False, Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.3 pacman-lib/pactest/pmtest.py:1.4 --- pacman-lib/pactest/pmtest.py:1.3 Thu Feb 22 23:22:21 2007 +++ pacman-lib/pactest/pmtest.py Thu Feb 22 23:54:49 2007 @@ -188,10 +188,10 @@ cmd.append("libtool gdb --args") if pacman["valgrind"]: cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes") - if not pacman["manual-confirm"]: - cmd.append("--noconfirm") cmd.append("%s --config=%s --root=%s" \ % (pacman["bin"], os.path.join(self.root, PACCONF), self.root)) + if not pacman["manual-confirm"]: + cmd.append("--noconfirm") if pacman["debug"]: cmd.append("--debug=%s" % pacman["debug"]) cmd.append("%s" % self.args)

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pactest.py pmtest.py)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 23:22:21 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.4 -> 1.5) pmtest.py (1.2 -> 1.3) * Removed a stray print statement left in there * Fail when no tests defined * Added --manual-confirm to help with hand testing ------------+ pactest.py | 18 ++++++++++++------ pmtest.py | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) Index: pacman-lib/pactest/pactest.py diff -u pacman-lib/pactest/pactest.py:1.4 pacman-lib/pactest/pactest.py:1.5 --- pacman-lib/pactest/pactest.py:1.4 Thu Feb 22 21:10:56 2007 +++ pacman-lib/pactest/pactest.py Thu Feb 22 23:22:21 2007 @@ -34,7 +34,6 @@ def globTests(option, opt_str, value, parser): globlist = [] globlist.extend(glob.glob(value)) - print "globlist=%s" % globlist setattr(parser.values, option.dest, globlist) def createOptParser(): @@ -68,6 +67,9 @@ parser.add_option("--valgrind", action = "store_true", dest = "valgrind", default = False, help = "use valgrind while calling pacman") + parser.add_option("--manual-confirm", action = "store_true", + dest = "manualconfirm", default = False, + help = "do not use --noconfirm for pacman calls") return parser @@ -84,11 +86,15 @@ env.pacman["nolog"] = opts.nolog env.pacman["gdb"] = opts.gdb env.pacman["valgrind"] = opts.valgrind - for i in opts.testcases: - env.addtest(i) + env.pacman["manual-confirm"] = opts.manualconfirm - # run tests and print overall results - env.run() - env.results() + if len(opts.testcases) == 0: + print "no tests defined, nothing to do" + else: + for i in opts.testcases: env.addtest(i) + + # run tests and print overall results + env.run() + env.results() # vim: set ts=4 sw=4 et: Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.2 pacman-lib/pactest/pmtest.py:1.3 --- pacman-lib/pactest/pmtest.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmtest.py Thu Feb 22 23:22:21 2007 @@ -188,7 +188,9 @@ cmd.append("libtool gdb --args") if pacman["valgrind"]: cmd.append("valgrind --tool=memcheck --leak-check=full --show-reachable=yes") - cmd.append("%s --noconfirm --config=%s --root=%s" \ + if not pacman["manual-confirm"]: + cmd.append("--noconfirm") + cmd.append("%s --config=%s --root=%s" \ % (pacman["bin"], os.path.join(self.root, PACCONF), self.root)) if pacman["debug"]: cmd.append("--debug=%s" % pacman["debug"])

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (pacman.c)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 22:40:20 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.100 -> 1.101) We don't need this anymore ----------+ pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.100 pacman-lib/src/pacman/pacman.c:1.101 --- pacman-lib/src/pacman/pacman.c:1.100 Thu Feb 22 16:34:52 2007 +++ pacman-lib/src/pacman/pacman.c Thu Feb 22 22:40:20 2007 @@ -166,7 +166,7 @@ printf("\n"); printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, LIB_VERSION); printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2006 Judd Vinet <jvinet(a)zeroflux.org>\n"); - printf("\\ '-. '-' '-' '-' & Frugalware developers <frugalware-devel(a)frugalware.org>\n"); + printf("\\ '-. '-' '-' '-'\n"); printf(" '--' \n"); printf(_(" This program may be freely redistributed under\n")); printf(_(" the terms of the GNU General Public License\n"));

1 0

[pacman-dev] CVS update of pacman-lib (9 files)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Thursday, February 22, 2007 @ 22:23:07 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.35 -> 1.36) doc/.cvsignore (1.2 -> 1.3) doc/Makefile.am (1.15 -> 1.16) doc/PKGBUILD.5 (1.7 -> 1.8) doc/libalpm.3 (1.4 -> 1.5) doc/makepkg.8 (1.6 -> 1.7) doc/makepkg.conf.5 (1.2 -> 1.3) doc/pacman.8 (1.6 -> 1.7) doc/pacman.conf.5 (1.2 -> 1.3) * Removed man2html stuff from configure. It is now available in the doc/ directory by running the target man2html, e.g. 'make man2html'. * Slightly fixed up the bottom of the manpages. --------------------+ configure.ac | 23 ----------------------- doc/.cvsignore | 1 + doc/Makefile.am | 48 ++++++++++++++++++++++++------------------------ doc/PKGBUILD.5 | 3 ++- doc/libalpm.3 | 3 ++- doc/makepkg.8 | 3 ++- doc/makepkg.conf.5 | 3 ++- doc/pacman.8 | 3 ++- doc/pacman.conf.5 | 3 ++- 9 files changed, 37 insertions(+), 53 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.35 pacman-lib/configure.ac:1.36 --- pacman-lib/configure.ac:1.35 Thu Feb 22 21:00:30 2007 +++ pacman-lib/configure.ac Thu Feb 22 22:23:06 2007 @@ -38,11 +38,6 @@ AM_PROG_LIBTOOL AM_CONDITIONAL(LINKSTATIC, test "$enable_static" = "yes") -dnl Help line for man2html -AC_ARG_ENABLE(man2html, - AC_HELP_STRING([--enable-man2html], [Build html docs via man2html]), - [wantman2html=$enableval], [wantman2html=no]) - dnl Help line for doxygen AC_ARG_ENABLE(doxygen, AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]), @@ -118,23 +113,6 @@ AC_MSG_CHECKING(your blood pressure) AC_MSG_RESULT([a bit high, but we can proceed]) -dnl Check for man2html binary -AC_MSG_CHECKING(for man2html) -if test "x$wantman2html" = "xyes" ; then - AC_CHECK_PROGS([MAN2HTML], [man2html]) - if test $MAN2HTML ; then - AC_MSG_RESULT(yes) - useman2html=yes - else - AC_MSG_RESULT(no, man2html missing) - useman2html=no - fi -else - AC_MSG_RESULT(no, disabled by configure) - useman2html=no -fi -AM_CONDITIONAL(HAS_MAN2HTML, test "x$useman2html" = "xyes") - dnl Check for doxygen support AC_MSG_CHECKING(for doxygen) if test "x$wantdoxygen" = "xyes" ; then @@ -242,7 +220,6 @@ pacman.conf location : ${configfile} Doxygen support : ${usedoxygen} - man2html support : ${useman2html} debug support : ${debug} fakeroot-proof support : ${fakeroot} " Index: pacman-lib/doc/.cvsignore diff -u pacman-lib/doc/.cvsignore:1.2 pacman-lib/doc/.cvsignore:1.3 --- pacman-lib/doc/.cvsignore:1.2 Fri Feb 9 16:54:57 2007 +++ pacman-lib/doc/.cvsignore Thu Feb 22 22:23:06 2007 @@ -1,3 +1,4 @@ Makefile Makefile.in +*.html man3 Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.15 pacman-lib/doc/Makefile.am:1.16 --- pacman-lib/doc/Makefile.am:1.15 Thu Feb 22 16:34:51 2007 +++ pacman-lib/doc/Makefile.am Thu Feb 22 22:23:07 2007 @@ -1,27 +1,3 @@ -all: makepkg.8 pacman.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 - -if HAS_MAN2HTML -makepkg.8: - man2html makepkg.8 > html/makepkg.8.html - -pacman.8: - man2html pacman.8 > html/pacman.8.html - -PKGBUILD.5: - man2html PKGBUILD.5 > html/PKGBUILD.5.html - -makepkg.conf.5: - man2html makepkg.8 > html/makepkg.8.html - -pacman.conf.5: - man2html pacman.conf.5 > html/pacman.conf.5.html - -endif - -clean: - rm -f html/*.html - rm -f man3/*.3 - man_MANS = \ pacman.8 \ makepkg.8 \ @@ -35,3 +11,27 @@ endif EXTRA_DIST = $(man_MANS) + +MAN2HTML=man2html -r +SUFFIXES=.3 .5 .8 .3.html .5.html .8.html + +# targets for each man section, sed removes a weird artifact left by man2html +.3.3.html: + $(RM) $@ + -${MAN2HTML} $< | sed '1,2d' > $@ + +.5.5.html: + $(RM) $@ + -${MAN2HTML} $< | sed '1,2d' > $@ + +.8.8.html: + $(RM) $@ + -${MAN2HTML} $< | sed '1,2d' > $@ + +man2html: pacman.8.html makepkg.8.html PKGBUILD.5.html makepkg.conf.5.html pacman.conf.5.html libalpm.3.html + +clean-local: + $(RM) *.html + $(RM) man3/*.3 + +.PHONY: man2html Index: pacman-lib/doc/PKGBUILD.5 diff -u pacman-lib/doc/PKGBUILD.5:1.7 pacman-lib/doc/PKGBUILD.5:1.8 --- pacman-lib/doc/PKGBUILD.5:1.7 Sun Feb 11 20:08:35 2007 +++ pacman-lib/doc/PKGBUILD.5 Thu Feb 22 22:23:07 2007 @@ -269,5 +269,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/libalpm.3 diff -u pacman-lib/doc/libalpm.3:1.4 pacman-lib/doc/libalpm.3:1.5 --- pacman-lib/doc/libalpm.3:1.4 Thu Feb 8 22:44:54 2007 +++ pacman-lib/doc/libalpm.3 Thu Feb 22 22:23:07 2007 @@ -48,5 +48,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/makepkg.8 diff -u pacman-lib/doc/makepkg.8:1.6 pacman-lib/doc/makepkg.8:1.7 --- pacman-lib/doc/makepkg.8:1.6 Wed Feb 14 10:06:03 2007 +++ pacman-lib/doc/makepkg.8 Thu Feb 22 22:23:07 2007 @@ -141,5 +141,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/makepkg.conf.5 diff -u pacman-lib/doc/makepkg.conf.5:1.2 pacman-lib/doc/makepkg.conf.5:1.3 --- pacman-lib/doc/makepkg.conf.5:1.2 Fri Feb 9 10:37:20 2007 +++ pacman-lib/doc/makepkg.conf.5 Thu Feb 22 22:23:07 2007 @@ -142,5 +142,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.6 pacman-lib/doc/pacman.8:1.7 --- pacman-lib/doc/pacman.8:1.6 Sat Feb 10 19:27:45 2007 +++ pacman-lib/doc/pacman.8 Thu Feb 22 22:23:07 2007 @@ -259,5 +259,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. Index: pacman-lib/doc/pacman.conf.5 diff -u pacman-lib/doc/pacman.conf.5:1.2 pacman-lib/doc/pacman.conf.5:1.3 --- pacman-lib/doc/pacman.conf.5:1.2 Thu Feb 8 22:44:54 2007 +++ pacman-lib/doc/pacman.conf.5 Thu Feb 22 22:23:07 2007 @@ -137,5 +137,6 @@ Aurelien Foret <aurelien(a)archlinux.org> Aaron Griffin <aaron(a)archlinux.org> Dan McGee <dan(a)archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors.

1 0