- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/contrib (pacdiff)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 03:03:50 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Added: pacdiff (1.1) I had this laying around, figured someone might find it useful ---------+ pacdiff | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Index: pacman-lib/contrib/pacdiff diff -u /dev/null pacman-lib/contrib/pacdiff:1.1 --- /dev/null Fri Feb 23 03:03:50 2007 +++ pacman-lib/contrib/pacdiff Fri Feb 23 03:03:50 2007 @@ -0,0 +1,47 @@ +#!/bin/sh +# pacdiff : a simple pacnew/pacorig/pacsave updater for /etc/ +# +# Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +# Original http://phraktured.net/config/bin/pacdiff + +diffprog=${DIFFPROG:-vimdiff} +for x in $(find /etc/ -name *.pacnew -o -name *.pacorig -o -name *.pacsave) +do + echo "File: ${x%.pac*}" + chk="$(cmp $x ${x%.pac*})" + if [ -z "${chk}" ]; then + echo " Files are identical, removing..." + rm $x + else + echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " + read c + c="$(echo $c| tr A-Z a-z)" #tolower + if [ "$c" = "r" ]; then + rm $x + elif [ "$c" = "s" ]; then + continue + else + [ "$c" = "n" -o "$c" = "N" ] || $diffprog $x ${x%.pac*} + echo -n " Remove file? [Y/n] " + read c + [ "$c" = "n" -o "$c" = "N" ] || rm $x + fi + fi +done

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 03:00:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.76 -> 1.77) * The info level for this was wrong, causing replacements to not really work -----------+ package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.76 pacman-lib/lib/libalpm/package.c:1.77 --- pacman-lib/lib/libalpm/package.c:1.76 Fri Feb 23 02:53:25 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 23 03:00:06 2007 @@ -861,8 +861,8 @@ ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); - if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->replaces; }

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 02:53:25 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.75 -> 1.76) sync.c (1.103 -> 1.104) * Too much debugging output in the alpm_pkg_compare_versions function * Using the wrong info level for replacements -----------+ package.c | 3 --- sync.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.75 pacman-lib/lib/libalpm/package.c:1.76 --- pacman-lib/lib/libalpm/package.c:1.75 Thu Feb 22 21:10:56 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 23 02:53:25 2007 @@ -167,9 +167,6 @@ } } - _alpm_log(PM_LOG_DEBUG, _("compare versions for %s: %s vs %s, result=%d"), - local_pkg->name, local_pkg->version, pkg->version, cmp); - return(cmp); } Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.103 pacman-lib/lib/libalpm/sync.c:1.104 --- pacman-lib/lib/libalpm/sync.c:1.103 Thu Feb 22 21:10:56 2007 +++ pacman-lib/lib/libalpm/sync.c Fri Feb 23 02:53:25 2007 @@ -121,28 +121,34 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j, *k, *m; /* wow */ ALPM_LOG_FUNC; /* check for "recommended" package replacements */ _alpm_log(PM_LOG_DEBUG, _("checking for package replacements")); for(i = dbs_sync; i; i = i->next) { - for(j = _alpm_db_get_pkgcache(i->data, INFRQ_DEPENDS); j; j = j->next) { + pmdb_t *db = i->data; + + /* for each db, check each package's REPLACES list */ + for(j = _alpm_db_get_pkgcache(db, INFRQ_DESC); j; j = j->next) { pmpkg_t *spkg = j->data; - for(k = spkg->replaces; k; k = k->next) { - alpm_list_t *m; + + for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { + const char *replacement = k->data; + /* compare to local DB */ for(m = _alpm_db_get_pkgcache(db_local, INFRQ_NONE); m; m = m->next) { pmpkg_t *lpkg = m->data; - if(strcmp(k->data, lpkg->name) == 0) { - _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name); + + if(strcmp(replacement, lpkg->name) == 0) { + _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), replacement, spkg->name); if(alpm_list_find_str(handle->ignorepkg, lpkg->name)) { _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), lpkg->name, lpkg->version, spkg->name, spkg->version); } else { /* get confirmation for the replacement */ int doreplace = 0; - QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, ((pmdb_t *)i->data)->treename, &doreplace); + QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace); if(doreplace) { /* if confirmed, add this to the 'final' list, designating 'lpkg' as

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 02:50:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: add.c (1.31 -> 1.32) sync.c (1.113 -> 1.114) * conflicts are returned with the full path, so prepending root is redundant --------+ add.c | 6 ++---- sync.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.31 pacman-lib/src/pacman/add.c:1.32 --- pacman-lib/src/pacman/add.c:1.31 Tue Feb 13 23:52:17 2007 +++ pacman-lib/src/pacman/add.c Fri Feb 23 02:50:35 2007 @@ -124,16 +124,14 @@ pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), - alpm_option_get_root(), + MSG(NL, _("%s exists in both '%s' and '%s'\n"), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem\n"), + MSG(NL, _("%s: %s exists in filesystem\n"), alpm_conflict_get_target(conflict), - alpm_option_get_root(), alpm_conflict_get_file(conflict)); break; } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.113 pacman-lib/src/pacman/sync.c:1.114 --- pacman-lib/src/pacman/sync.c:1.113 Wed Feb 21 03:16:26 2007 +++ pacman-lib/src/pacman/sync.c Fri Feb 23 02:50:35 2007 @@ -511,7 +511,7 @@ * when sysupgrade'ing with an older version of pacman. */ data = alpm_trans_get_packages(); - for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { + for(i = data; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); pmpkg_t *spkg = alpm_sync_get_package(sync); if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) { @@ -706,16 +706,14 @@ pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), - alpm_option_get_root(), + MSG(NL, _("%s exists in both '%s' and '%s'\n"), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem\n"), + MSG(NL, _("%s: %s exists in filesystem\n"), alpm_conflict_get_target(conflict), - alpm_option_get_root(), alpm_conflict_get_file(conflict)); break; }

1 0

[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