February 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/pactest/tests (5 files)
by Dan McGee 27 Feb '07

27 Feb '07

Date: Monday, February 26, 2007 @ 20:34:08 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: upgrade050.py (1.1) upgrade051.py (1.1) upgrade052.py (1.1) upgrade053.py (1.1) upgrade054.py (1.1) * Added 5 new upgrade tests, which check various things with depends, provides, and conflicts. - upgrade051 is known to fail- but we want to eventually make it work. - upgrade052 is Nagy's bug as reported on the ML- I think. If it isn't, let me know. ---------------+ upgrade050.py | 15 +++++++++++++++ upgrade051.py | 15 +++++++++++++++ upgrade052.py | 19 +++++++++++++++++++ upgrade053.py | 19 +++++++++++++++++++ upgrade054.py | 19 +++++++++++++++++++ 5 files changed, 87 insertions(+) Index: pacman-lib/pactest/tests/upgrade050.py diff -u /dev/null pacman-lib/pactest/tests/upgrade050.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade050.py Mon Feb 26 20:34:07 2007 @@ -0,0 +1,15 @@ +self.description = "Upgrade package with a conflict == depend (not installed)" + +p1 = pmpkg("pkg1") +p1.conflicts = ["pkg2"] +p1.depends = ["pkg2"] +self.addpkg(p1) + +p2 = pmpkg("pkg2") +self.addpkg(p2) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/upgrade051.py diff -u /dev/null pacman-lib/pactest/tests/upgrade051.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade051.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,15 @@ +self.description = "Upgrade to a package that provides another package" + +lp = pmpkg("pkg1") +self.addpkg2db("local", lp) + +p = pmpkg("pkg2") +p.conflicts = ["pkg1"] +p.provides = ["pkg1"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/upgrade052.py diff -u /dev/null pacman-lib/pactest/tests/upgrade052.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade052.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,19 @@ +self.description = "Nagy's bug (I think) -- in progress" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary", "real"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.0-2") +p.provides = ["real"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg2|1.0-1") Index: pacman-lib/pactest/tests/upgrade053.py diff -u /dev/null pacman-lib/pactest/tests/upgrade053.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade053.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,19 @@ +self.description = "Upgrade a package with dependency on provided package (same)" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary", "real"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["imaginary"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_EXIST=pkg2") Index: pacman-lib/pactest/tests/upgrade054.py diff -u /dev/null pacman-lib/pactest/tests/upgrade054.py:1.1 --- /dev/null Mon Feb 26 20:34:08 2007 +++ pacman-lib/pactest/tests/upgrade054.py Mon Feb 26 20:34:08 2007 @@ -0,0 +1,19 @@ +self.description = "Upgrade a package with dependency on provided package (different)" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary", "real"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["real"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_EXIST=pkg2")

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (db.c)
by Dan McGee 27 Feb '07

27 Feb '07

Date: Monday, February 26, 2007 @ 18:32:08 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: db.c (1.61 -> 1.62) * db search optimization- why don't we compile the regex once instead of once per package. ------+ db.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.61 pacman-lib/lib/libalpm/db.c:1.62 --- pacman-lib/lib/libalpm/db.c:1.61 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/db.c Mon Feb 26 18:32:08 2007 @@ -105,21 +105,21 @@ for(i = needles; i; i = i->next) { char *targ; + regex_t reg; if(i->data == NULL) { continue; } targ = i->data; _alpm_log(PM_LOG_DEBUG, "searching for target '%s'", targ); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } for(j = _alpm_db_get_pkgcache(db, INFRQ_DESC|INFRQ_DEPENDS); j; j = j->next) { pmpkg_t *pkg = j->data; char *matched = NULL; - regex_t reg; - - if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - RET_ERR(PM_ERR_INVALID_REGEX, NULL); - } /* check name */ if (regexec(&reg, pkg->name, 0, 0, 0) == 0) { @@ -130,6 +130,8 @@ matched = pkg->desc; } /* check provides */ + /* TODO: should we be doing this, and should we print something + * differently when we do match it since it isn't currently printed? */ else { for(k = pkg->provides; k; k = k->next) { if (regexec(&reg, k->data, 0, 0, 0) == 0) { @@ -138,13 +140,15 @@ } } } - regfree(&reg); if(matched != NULL) { - _alpm_log(PM_LOG_DEBUG, " search target '%s' matched '%s'", targ, matched); + _alpm_log(PM_LOG_DEBUG, " search target '%s' matched '%s'", + targ, matched); ret = alpm_list_add(ret, pkg); } } + + regfree(&reg); } return(ret);

1 0

[pacman-dev] CVS update of pacman-lib (3 files)
by Dan McGee 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 10:10:54 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.15 -> 1.16) contrib/Makefile.am (1.2 -> 1.3) scripts/Makefile.am (1.6 -> 1.7) * TODO updates. * Makefile.am updates for Aaron's move of re-pacman to contrib. ---------------------+ TODO.dan | 15 +++++++++++++-- contrib/Makefile.am | 1 + scripts/Makefile.am | 1 - 3 files changed, 14 insertions(+), 3 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.15 pacman-lib/TODO.dan:1.16 --- pacman-lib/TODO.dan:1.15 Wed Feb 21 23:36:02 2007 +++ pacman-lib/TODO.dan Mon Feb 26 10:10:53 2007 @@ -84,9 +84,20 @@ differ here. Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should -allow us to do this. +allow us to do this. Make universal message functions for systemwide use, +including all pacman utilites- abs, pacman-optimize, etc. -Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, 6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571 +Bugs/FRs to smash: 6468, 6437, 6430?, 6420, 6404, 6389, 6312?, 6284, 6273?, +6255?, 6208, 5987, 5885, 5571, 4182, 3492, 2810?, 1769, 1588, 1571 + +Remove _alpm from function names now that we have SYMHIDDEN and static +declarations. + +Remove alpm.c, put functions where they should be. + +Update doxygen comments, they may need some work. Try to document all of the +private internal functions too- it helps a ton for people just getting a +start on pacman hacking. Other smaller things: --------------------- Index: pacman-lib/contrib/Makefile.am diff -u pacman-lib/contrib/Makefile.am:1.2 pacman-lib/contrib/Makefile.am:1.3 --- pacman-lib/contrib/Makefile.am:1.2 Fri Feb 23 03:07:48 2007 +++ pacman-lib/contrib/Makefile.am Mon Feb 26 10:10:53 2007 @@ -2,5 +2,6 @@ bash_completion \ pacsearch \ pacdiff \ + re-pacman \ zsh_completion Index: pacman-lib/scripts/Makefile.am diff -u pacman-lib/scripts/Makefile.am:1.6 pacman-lib/scripts/Makefile.am:1.7 --- pacman-lib/scripts/Makefile.am:1.6 Thu Feb 22 16:34:52 2007 +++ pacman-lib/scripts/Makefile.am Mon Feb 26 10:10:53 2007 @@ -11,7 +11,6 @@ rankmirrors \ repo-add \ repo-remove \ - re-pacman \ updatesync EXTRA_DIST = $(bin_SCRIPTS)

1 0

[pacman-dev] CVS update of pacman-lib (HACKING contrib/re-pacman scripts/re-pacman)
by Aaron Griffin 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 04:19:34 Author: aaron Path: /home/cvs-pacman/pacman-lib Added: contrib/re-pacman (1.1) Modified: HACKING (1.1 -> 1.2) Removed: scripts/re-pacman (1.3) * Added a small note to HACKING * Moved re-pacman to contrib/ as it's probably not as useful as the other stuff in scripts/ -------------------+ HACKING | 3 + contrib/re-pacman | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/re-pacman | 79 ---------------------------------------------------- 3 files changed, 82 insertions(+), 79 deletions(-) Index: pacman-lib/HACKING diff -u pacman-lib/HACKING:1.1 pacman-lib/HACKING:1.2 --- pacman-lib/HACKING:1.1 Tue Feb 20 11:29:21 2007 +++ pacman-lib/HACKING Mon Feb 26 04:19:33 2007 @@ -1,6 +1,9 @@ Contributing to pacman ====================== +Please read 'submitting-patches' and 'translation-help' in the same directory as +this file. + Coding style ------------ Index: pacman-lib/contrib/re-pacman diff -u /dev/null pacman-lib/contrib/re-pacman:1.1 --- /dev/null Mon Feb 26 04:19:34 2007 +++ pacman-lib/contrib/re-pacman Mon Feb 26 04:19:33 2007 @@ -0,0 +1,79 @@ +#!/bin/sh +# +# re-pacman: regenerate a pacman package based on installed files and the +# pacman database entries. Useful for reuse, or possible config file +# extension +# +# Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> +# +# 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. +# + +#TODO +# * Check for md5 changes in backup lines and change pkgrel + +pacinfo () { + [ $# -ne 2 ] && return 1 + #use echo to strip spaces + echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-) +} + +make_pkginfo () { + echo "# Generated by re-pacman 1.0.0" + echo "# On $(date)" + echo "pkgname =$(pacinfo ${1} Name)" + echo "pkgver =$(pacinfo ${1} Version)" + echo "pkgdesc =$(pacinfo ${1} Description)" + echo "url =$(pacinfo ${1} URL)" + echo "builddate =$(pacinfo ${1} 'Build Date')" + echo "packager =$(pacinfo ${1} Packager)" + echo "size =$(pacinfo ${1} Size)" + echo "arch =$(pacinfo ${1} Architecture)" + deps=$(pacinfo ${1} 'Depends On') + for d in ${deps}; do + echo "depend = ${d}" + done +} + +if [ $# -ne 1 ]; then + echo "usage: re-pacman <installed package name>" + exit 1 +fi + +ver=$(pacinfo ${1} Version) +if [ "x${ver}" = "x" ]; then + echo "Package '${1}' not found, aborting." + exit 1 +fi + +echo ":: Cleaning up old files" +rm -f .PKGINFO .FILELIST "${1}-${ver}.pkg.tar.gz" + +echo ":: Building PKGINFO" +make_pkginfo ${1} > .PKGINFO +echo ":: Building FILELIST" +pacman -Ql ${1} | cut -d' ' -f2- > .FILELIST + +flist=".PKGINFO .FILELIST" +flist="${flist} $(pacman -Ql ${1} | sed 's|\w* $.*$|/\1|g' | grep -v '/$')" + +echo ":: Building final package tarball" +echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null + +rm -f .PKGINFO .FILELIST +echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation" + +# vim: set ts=2 sw=2 noet: Index: pacman-lib/scripts/re-pacman diff -u pacman-lib/scripts/re-pacman:1.3 pacman-lib/scripts/re-pacman:removed --- pacman-lib/scripts/re-pacman:1.3 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/re-pacman Mon Feb 26 04:19:34 2007 @@ -1,79 +0,0 @@ -#!/bin/sh -# -# re-pacman: regenerate a pacman package based on installed files and the -# pacman database entries. Useful for reuse, or possible config file -# extension -# -# Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> -# -# 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. -# - -#TODO -# * Check for md5 changes in backup lines and change pkgrel - -pacinfo () { - [ $# -ne 2 ] && return 1 - #use echo to strip spaces - echo $(pacman -Qi ${1} | grep "${2}" | cut -d: -f2-) -} - -make_pkginfo () { - echo "# Generated by re-pacman 1.0.0" - echo "# On $(date)" - echo "pkgname =$(pacinfo ${1} Name)" - echo "pkgver =$(pacinfo ${1} Version)" - echo "pkgdesc =$(pacinfo ${1} Description)" - echo "url =$(pacinfo ${1} URL)" - echo "builddate =$(pacinfo ${1} 'Build Date')" - echo "packager =$(pacinfo ${1} Packager)" - echo "size =$(pacinfo ${1} Size)" - echo "arch =$(pacinfo ${1} Architecture)" - deps=$(pacinfo ${1} 'Depends On') - for d in ${deps}; do - echo "depend = ${d}" - done -} - -if [ $# -ne 1 ]; then - echo "usage: re-pacman <installed package name>" - exit 1 -fi - -ver=$(pacinfo ${1} Version) -if [ "x${ver}" = "x" ]; then - echo "Package '${1}' not found, aborting." - exit 1 -fi - -echo ":: Cleaning up old files" -rm -f .PKGINFO .FILELIST "${1}-${ver}.pkg.tar.gz" - -echo ":: Building PKGINFO" -make_pkginfo ${1} > .PKGINFO -echo ":: Building FILELIST" -pacman -Ql ${1} | cut -d' ' -f2- > .FILELIST - -flist=".PKGINFO .FILELIST" -flist="${flist} $(pacman -Ql ${1} | sed 's|\w* $.*$|/\1|g' | grep -v '/$')" - -echo ":: Building final package tarball" -echo ${flist} | tr ' ' '\n' | tar czf "${1}-${ver}.pkg.tar.gz" -T - 2>/dev/null - -rm -f .PKGINFO .FILELIST -echo ":: Package '${1}-${ver}.pkg.tar.gz' is now ready for installation" - -# vim: set ts=2 sw=2 noet:

1 0

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

26 Feb '07

Date: Monday, February 26, 2007 @ 03:43:02 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: scripts/makepkg (1.53 -> 1.54) src/pacman/deptest.c (1.14 -> 1.15) src/pacman/pacman.c (1.101 -> 1.102) src/pacman/query.c (1.25 -> 1.26) src/pacman/remove.c (1.28 -> 1.29) src/pacman/sync.c (1.114 -> 1.115) src/pacman/util.c (1.29 -> 1.30) * pacman hidden arguments: removed -Y and -D. -T is the only hidden arg now, to be used in place of -Y. Also, -D was rather silly, as it does mostly what -S does. * Cleaned up pacman_deptest - removed the goofy faketarget stuff (NEEDS testing still) * libalpm function renames ----------------------+ scripts/makepkg | 10 +-- src/pacman/deptest.c | 131 ++++++------------------------------------------- src/pacman/pacman.c | 11 ---- src/pacman/query.c | 8 +- src/pacman/remove.c | 4 - src/pacman/sync.c | 12 ++-- src/pacman/util.c | 9 ++- 7 files changed, 43 insertions(+), 142 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.53 pacman-lib/scripts/makepkg:1.54 --- pacman-lib/scripts/makepkg:1.53 Fri Feb 23 21:11:52 2007 +++ pacman-lib/scripts/makepkg Mon Feb 26 03:43:02 2007 @@ -184,7 +184,7 @@ pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? - if [ $ret -eq 127 ]; then #unresolved deps + if [ $ret -eq 1 ]; then #unresolved deps #strip out the pacman prefix from "requires: xyz" echo $pmout | sed 's|requires:||g' elif [ $ret -ne 0 ]; then @@ -211,8 +211,8 @@ FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -D $deplist - if [ "$?" = "127" ]; then + sudo pacman $PACMAN_OPTS -S $deplist + if [ $? -eq 1 ]; then error "Failed to install missing dependencies." exit 1 fi @@ -223,8 +223,8 @@ elif [ "$DEP_BIN" = "1" ]; then # install missing deps from binary packages (using pacman -S) msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -D $deplist - if [ "$?" = "127" ]; then + pacman $PACMAN_OPTS -S $deplist + if [ $? -eq 1 ]; then error "Failed to install missing dependencies." exit 1 fi Index: pacman-lib/src/pacman/deptest.c diff -u pacman-lib/src/pacman/deptest.c:1.14 pacman-lib/src/pacman/deptest.c:1.15 --- pacman-lib/src/pacman/deptest.c:1.14 Mon Feb 12 01:44:00 2007 +++ pacman-lib/src/pacman/deptest.c Mon Feb 26 03:43:02 2007 @@ -36,131 +36,36 @@ extern config_t *config; -/* TODO this function is fairly messy, with the obscure return codes and the odd - * 'dummy' packages and all these messy FREELISTs of synctargs - */ int pacman_deptest(alpm_list_t *targets) { - alpm_list_t *data, *i; - char *str; int retval = 0; + pmdb_t *local; + pmpkg_t *pkg; + alpm_list_t *i, *provides; if(targets == NULL) { return(0); } + + local = alpm_option_get_localdb(); - /* we create a transaction to hold a dummy package to be able to use - * deps checkings from alpm_trans_prepare() */ - if(alpm_trans_init(PM_TRANS_TYPE_ADD, 0, NULL, NULL, NULL) == -1) { - ERR(NL, "%s", alpm_strerror(pm_errno)); - if(pm_errno == PM_ERR_HANDLE_LOCK) { - MSG(NL, _(" if you're sure a package manager is not already running,\n" - " you can remove %s%s\n"), alpm_option_get_root(), PM_LOCK); - } - return(1); - } - - /* We use a hidden facility from alpm_trans_addtarget() to add a dummy - * target to the transaction (see the library code for details). - * It allows us to use alpm_trans_prepare() to check dependencies of the - * given target. - */ - str = (char *)malloc(strlen("name=dummy|version=1.0-1")+1); - if(str == NULL) { - ERR(NL, _("memory allocation failure\n")); - retval = 1; - goto cleanup; - } - strcpy(str, "name=dummy|version=1.0-1"); for(i = targets; i; i = alpm_list_next(i)) { - const char *targ = alpm_list_getdata(i); - str = (char *)realloc(str, strlen(str)+8+strlen(targ)+1); - strcat(str, "|depend="); - strcat(str, targ); - } - vprint(_("add target %s\n"), str); - if(alpm_trans_addtarget(str) == -1) { - FREE(str); - ERR(NL, _("could not add target (%s)\n"), alpm_strerror(pm_errno)); - retval = 1; - goto cleanup; - } - FREE(str); - - if(alpm_trans_prepare(&data) == -1) { - alpm_list_t *synctargs = NULL; - retval = 126; - /* return 126 = deps were missing, but successfully resolved - * return 127 = deps were missing, and failed to resolve; OR - * = deps were missing, but no resolution was attempted; OR - * = unresolvable conflicts were found - */ - switch(pm_errno) { - case PM_ERR_UNSATISFIED_DEPS: - for(i = data; i; i = alpm_list_next(i)) { - pmdepmissing_t *miss = alpm_list_getdata(i); - if(!config->op_d_resolve) { - MSG(NL, _("requires: %s"), alpm_dep_get_name(miss)); - switch(alpm_dep_get_mod(miss)) { - case PM_DEP_MOD_ANY: - break; - case PM_DEP_MOD_EQ: - MSG(CL, "=%s", alpm_dep_get_version(miss)); - break; - case PM_DEP_MOD_GE: - MSG(CL, ">=%s", alpm_dep_get_version(miss)); - break; - case PM_DEP_MOD_LE: - MSG(CL, "<=%s", alpm_dep_get_version(miss)); - break; - } - MSG(CL, "\n"); - } - synctargs = alpm_list_add(synctargs, strdup(alpm_dep_get_name(miss))); - } - alpm_list_free(data); - break; - case PM_ERR_CONFLICTING_DEPS: - /* we can't auto-resolve conflicts */ - for(i = data; i; i = alpm_list_next(i)) { - pmdepmissing_t *miss = alpm_list_getdata(i); - MSG(NL, _("conflict: %s"), alpm_dep_get_name(miss)); - } - retval = 127; - alpm_list_free(data); - break; - default: - retval = 127; - break; - } - - /* attempt to resolve missing dependencies */ - /* TODO: handle version comparators (eg, glibc>=2.2.5) */ - if(retval == 126 && synctargs != NULL) { - if(alpm_trans_release() == -1) { - ERR(NL, _("could not release transaction (%s)"), alpm_strerror(pm_errno)); - FREELIST(synctargs); - return(1); - } - if(!config->op_d_resolve || pacman_sync(synctargs) != 0) { - /* error (or -D not used) */ - retval = 127; + const char *pkgname; + + pkgname = alpm_list_getdata(i); + /* find this package in the local DB */ + pkg = alpm_db_get_pkg(local, pkgname); + + if(!pkg) { + /* not found, can we find anything that provides this in the local DB? */ + provides = alpm_db_whatprovides(local, pkgname); + if(!provides) { + /* nope, must be missing */ + MSG(NL, _("requires: %s"), pkgname); + retval = 1; } - FREELIST(synctargs); - return(retval); } - - FREELIST(synctargs); } - -cleanup: - if(!config->op_d_resolve) { - if(alpm_trans_release() == -1) { - ERR(NL, _("could not release transaction (%s)"), alpm_strerror(pm_errno)); - retval = 1; - } - } - return(retval); } Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.101 pacman-lib/src/pacman/pacman.c:1.102 --- pacman-lib/src/pacman/pacman.c:1.101 Thu Feb 22 22:40:20 2007 +++ pacman-lib/src/pacman/pacman.c Mon Feb 26 03:43:02 2007 @@ -217,7 +217,6 @@ static struct option opts[] = { {"add", no_argument, 0, 'A'}, - {"resolve", no_argument, 0, 'D'}, /* used by 'makepkg -s' */ {"freshen", no_argument, 0, 'F'}, {"query", no_argument, 0, 'Q'}, {"remove", no_argument, 0, 'R'}, @@ -264,7 +263,7 @@ struct stat st; unsigned short logmask; - while((opt = getopt_long(argc, argv, "ARUFQSTDYr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { if(opt < 0) { break; } @@ -316,11 +315,6 @@ alpm_option_set_cachedir(optarg); break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; - case 'D': - config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); - config->op_d_resolve = 1; - config->flags |= PM_TRANS_FLAG_ALLDEPS; - break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); config->flags |= PM_TRANS_FLAG_FRESHEN; @@ -331,9 +325,6 @@ case 'T': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); break; case 'U': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); break; case 'V': config->version = 1; break; - case 'Y': - config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); - break; case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { ERR(NL, _("'%s' is not a valid db path\n"), optarg); Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.25 pacman-lib/src/pacman/query.c:1.26 --- pacman-lib/src/pacman/query.c:1.25 Sun Feb 11 23:45:22 2007 +++ pacman-lib/src/pacman/query.c Mon Feb 26 03:43:02 2007 @@ -153,7 +153,7 @@ const char *grpname; grpname = alpm_grp_get_name(grp); - pkgnames = alpm_grp_get_packages(grp); + pkgnames = alpm_grp_get_pkgs(grp); for(p = pkgnames; p; p = alpm_list_next(p)) { MSG(NL, "%s %s\n", grpname, (char *)alpm_list_getdata(p)); @@ -162,7 +162,7 @@ } else { pmgrp_t *grp = alpm_db_readgrp(db_local, package); if(grp) { - alpm_list_t *p, *pkgnames = alpm_grp_get_packages(grp); + alpm_list_t *p, *pkgnames = alpm_grp_get_pkgs(grp); for(p = pkgnames; p; p = alpm_list_next(p)) { MSG(NL, "%s %s\n", package, (char *)alpm_list_getdata(p)); } @@ -217,7 +217,7 @@ pkgver = alpm_pkg_get_version(tmpp); if(config->op_q_list || config->op_q_orphans || config->op_q_foreign) { - info = alpm_db_readpkg(db_local, (char *)pkgname); + info = alpm_db_get_pkg(db_local, (char *)pkgname); if(info == NULL) { /* something weird happened */ ERR(NL, _("package \"%s\" not found\n"), pkgname); @@ -250,7 +250,7 @@ } } } else { - info = alpm_db_readpkg(db_local, package); + info = alpm_db_get_pkg(db_local, package); if(info == NULL) { ERR(NL, _("package \"%s\" not found\n"), package); continue; Index: pacman-lib/src/pacman/remove.c diff -u pacman-lib/src/pacman/remove.c:1.28 pacman-lib/src/pacman/remove.c:1.29 --- pacman-lib/src/pacman/remove.c:1.28 Thu Feb 1 01:35:30 2007 +++ pacman-lib/src/pacman/remove.c Mon Feb 26 03:43:02 2007 @@ -53,7 +53,7 @@ pmgrp_t *grp = alpm_db_readgrp(db_local, alpm_list_getdata(i)); if(grp) { int all; - alpm_list_t *pkgnames = alpm_grp_get_packages(grp); + alpm_list_t *pkgnames = alpm_grp_get_pkgs(grp); MSG(NL, _(":: group %s:\n"), alpm_grp_get_name(grp)); list_display(" ", pkgnames); @@ -117,7 +117,7 @@ if(config->flags & PM_TRANS_FLAG_RECURSE || config->flags & PM_TRANS_FLAG_CASCADE) { /* list transaction targets */ alpm_list_t *lst = NULL; - for(i = alpm_trans_get_packages(); i; i = alpm_list_next(i)) { + for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); lst = alpm_list_add(lst, strdup(alpm_pkg_get_name(pkg))); } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.114 pacman-lib/src/pacman/sync.c:1.115 --- pacman-lib/src/pacman/sync.c:1.114 Fri Feb 23 02:50:35 2007 +++ pacman-lib/src/pacman/sync.c Mon Feb 26 03:43:02 2007 @@ -292,7 +292,7 @@ if(grp) { /* TODO this should be a lot cleaner, why two outputs? */ MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp)); - list_display(" ", alpm_grp_get_packages(grp)); + list_display(" ", alpm_grp_get_pkgs(grp)); } } } @@ -305,7 +305,7 @@ MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp)); if(grp && level > 1) { - list_display(" ", alpm_grp_get_packages(grp)); + list_display(" ", alpm_grp_get_pkgs(grp)); } } } @@ -510,10 +510,10 @@ * this can prevent some of the "syntax error" problems users can have * when sysupgrade'ing with an older version of pacman. */ - data = alpm_trans_get_packages(); + data = alpm_trans_get_pkgs(); for(i = data; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *spkg = alpm_sync_get_package(sync); + pmpkg_t *spkg = alpm_sync_get_pkg(sync); if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) { MSG(NL, _("\n:: pacman has detected a newer version of the \"pacman\" package.\n")); MSG(NL, _(":: It is recommended that you allow pacman to upgrade itself\n")); @@ -567,7 +567,7 @@ found++; MSG(NL, _(":: group %s:\n"), targ); /* remove dupe entries in case a package exists in multiple repos */ - alpm_list_t *pkgs = alpm_list_remove_dupes(alpm_grp_get_packages(grp)); + alpm_list_t *pkgs = alpm_list_remove_dupes(alpm_grp_get_pkgs(grp)); list_display(" ", pkgs); if(yesno(_(":: Install whole content? [Y/n] "))) { for(k = pkgs; k; k = alpm_list_next(k)) { @@ -659,7 +659,7 @@ goto cleanup; } - packages = alpm_trans_get_packages(); + packages = alpm_trans_get_pkgs(); if(packages == NULL) { /* nothing to do: just exit without complaining */ MSG(NL, _(" local database is up to date\n")); Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.29 pacman-lib/src/pacman/util.c:1.30 --- pacman-lib/src/pacman/util.c:1.29 Sat Feb 10 04:34:59 2007 +++ pacman-lib/src/pacman/util.c Mon Feb 26 03:43:02 2007 @@ -274,7 +274,7 @@ for(i = syncpkgs; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *pkg = alpm_sync_get_package(sync); + pmpkg_t *pkg = alpm_sync_get_pkg(sync); /* If this sync record is a replacement, the data member contains * a list of packages to be removed due to the package that is being @@ -381,9 +381,14 @@ const unsigned short chomp = alpm_option_get_chomp(); const unsigned int hashlen = proglen - 8; const unsigned int hash = percent * hashlen / 100; - unsigned int lasthash = 0, mouth = 0; + static unsigned int lasthash = 0, mouth = 0; unsigned int i; + if(percent == 0) { + lasthash = 0; + mouth = 0; + } + printf(" ["); for(i = hashlen; i > 1; --i) { /* if special progress bar enabled */

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (17 files)
by Aaron Griffin 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 03:38:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.119 -> 1.120) alpm.c (1.119 -> 1.120) alpm.h (1.77 -> 1.78) be_files.c (1.30 -> 1.31) cache.c (1.34 -> 1.35) cache.h (1.10 -> 1.11) db.c (1.60 -> 1.61) db.h (1.25 -> 1.26) deps.c (1.69 -> 1.70) group.c (1.14 -> 1.15) package.c (1.77 -> 1.78) package.h (1.32 -> 1.33) provide.c (1.10 -> 1.11) provide.h (1.5 -> 1.6) remove.c (1.69 -> 1.70) sync.c (1.104 -> 1.105) trans.c (1.37 -> 1.38) * Enforce const char* params when using strings * Unified some functions names "package" -> "pkg" for consistency * Removed the goofy 'faketarget' stuff used for dep testing * Renamed alpm_pkg_isin -> alpm_pkg_find * Renamed alpm_db_readpkg -> alpm_db_get_pkg ------------+ add.c | 54 ------------------------------------------------------ alpm.c | 8 ++++---- alpm.h | 14 +++++++------- be_files.c | 2 +- cache.c | 6 +++--- cache.h | 4 ++-- db.c | 4 ++-- db.h | 6 +++--- deps.c | 16 ++++++++-------- group.c | 2 +- package.c | 21 +++++++++++---------- package.h | 6 +++--- provide.c | 2 +- provide.h | 2 +- remove.c | 2 +- sync.c | 8 ++++---- trans.c | 4 ++-- 17 files changed, 54 insertions(+), 107 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.119 pacman-lib/lib/libalpm/add.c:1.120 --- pacman-lib/lib/libalpm/add.c:1.119 Wed Feb 21 23:42:59 2007 +++ pacman-lib/lib/libalpm/add.c Mon Feb 26 03:38:48 2007 @@ -58,55 +58,6 @@ #include "remove.h" #include "handle.h" -static int add_faketarget(pmtrans_t *trans, char *name) -{ - char *ptr, *p; - char *str = NULL; - pmpkg_t *dummy = NULL; - - ALPM_LOG_FUNC; - - dummy = _alpm_pkg_new(NULL, NULL); - if(dummy == NULL) { - RET_ERR(PM_ERR_MEMORY, -1); - } - - /* Format: field1=value1|field2=value2|... - * Valid fields are "name", "version" and "depend" - */ - str = strdup(name); - ptr = str; - while((p = strsep(&ptr, "|")) != NULL) { - char *q; - if(p[0] == 0) { - continue; - } - q = strchr(p, '='); - if(q == NULL) { /* not a valid token */ - continue; - } - if(strncmp("name", p, q-p) == 0) { - STRNCPY(dummy->name, q+1, PKG_NAME_LEN); - } else if(strncmp("version", p, q-p) == 0) { - STRNCPY(dummy->version, q+1, PKG_VERSION_LEN); - } else if(strncmp("depend", p, q-p) == 0) { - dummy->depends = alpm_list_add(dummy->depends, strdup(q+1)); - } else { - _alpm_log(PM_LOG_ERROR, _("could not parse token %s"), p); - } - } - FREE(str); - if(dummy->name[0] == 0 || dummy->version[0] == 0) { - FREEPKG(dummy); - RET_ERR(PM_ERR_PKG_INVALID_NAME, -1); - } - - /* add the package to the transaction */ - trans->packages = alpm_list_add(trans->packages, dummy); - - return(0); -} - int SYMHIDDEN _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) { pmpkg_t *info = NULL; @@ -121,11 +72,6 @@ ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(name != NULL && strlen(name) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - /* Check if we need to add a fake target to the transaction. */ - if(strchr(name, '|')) { - return(add_faketarget(trans, name)); - } - _alpm_log(PM_LOG_DEBUG, _("loading target '%s'"), name); /* TODO FS#5120 we need a better way to check if a package is a valid package, Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.119 pacman-lib/lib/libalpm/alpm.c:1.120 --- pacman-lib/lib/libalpm/alpm.c:1.119 Wed Feb 14 00:34:21 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Feb 26 03:38:48 2007 @@ -330,7 +330,7 @@ * @param name of the package * @return the package entry on success, NULL on error */ -pmpkg_t SYMEXPORT *alpm_db_readpkg(pmdb_t *db, char *name) +pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) { ALPM_LOG_FUNC; @@ -362,7 +362,7 @@ * @param name name of the package * @return the list of packages on success, NULL on error */ -alpm_list_t SYMEXPORT *alpm_db_whatprovides(pmdb_t *db, char *name) +alpm_list_t SYMEXPORT *alpm_db_whatprovides(pmdb_t *db, const char *name) { ALPM_LOG_FUNC; @@ -379,7 +379,7 @@ * @param name of the group * @return the groups entry on success, NULL on error */ -pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, char *name) +pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name) { ALPM_LOG_FUNC; @@ -1153,7 +1153,7 @@ for(j = syncpkgs; j && !replace; j=j->next) { sync = j->data; if(sync->type == PM_SYNC_TYPE_REPLACE) { - if(_alpm_pkg_isin(spkg->name, sync->data)) { + if(_alpm_pkg_find(spkg->name, sync->data)) { replace=1; } } Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.77 pacman-lib/lib/libalpm/alpm.h:1.78 --- pacman-lib/lib/libalpm/alpm.h:1.77 Wed Feb 21 01:44:14 2007 +++ pacman-lib/lib/libalpm/alpm.h Mon Feb 26 03:38:48 2007 @@ -161,7 +161,7 @@ */ /* Database registration callback */ -typedef void (*alpm_cb_db_register)(char *, pmdb_t *); +typedef void (*alpm_cb_db_register)(const char *, pmdb_t *); pmdb_t *alpm_db_register(char *treename); int alpm_db_unregister(pmdb_t *db); @@ -173,11 +173,11 @@ int alpm_db_update(int level, pmdb_t *db); -pmpkg_t *alpm_db_readpkg(pmdb_t *db, char *name); +pmpkg_t *alpm_db_get_pkg(pmdb_t *db, const char *name); alpm_list_t *alpm_db_getpkgcache(pmdb_t *db); -alpm_list_t *alpm_db_whatprovides(pmdb_t *db, char *name); +alpm_list_t *alpm_db_whatprovides(pmdb_t *db, const char *name); -pmgrp_t *alpm_db_readgrp(pmdb_t *db, char *name); +pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name); alpm_list_t *alpm_db_getgrpcache(pmdb_t *db); alpm_list_t *alpm_db_search(pmdb_t *db, alpm_list_t* needles); @@ -242,7 +242,7 @@ * Groups */ const char *alpm_grp_get_name(pmgrp_t *grp); -alpm_list_t *alpm_grp_get_packages(pmgrp_t *grp); +alpm_list_t *alpm_grp_get_pkgs(pmgrp_t *grp); /* * Sync @@ -256,7 +256,7 @@ } pmsynctype_t; pmsynctype_t alpm_sync_get_type(pmsyncpkg_t *sync); -pmpkg_t *alpm_sync_get_package(pmsyncpkg_t *sync); +pmpkg_t *alpm_sync_get_pkg(pmsyncpkg_t *sync); void *alpm_sync_get_data(pmsyncpkg_t *sync); /* @@ -348,7 +348,7 @@ pmtranstype_t alpm_trans_get_type(); unsigned int alpm_trans_get_flags(); alpm_list_t * alpm_trans_get_targets(); -alpm_list_t * alpm_trans_get_packages(); +alpm_list_t * alpm_trans_get_pkgs(); int alpm_trans_init(pmtranstype_t type, unsigned int flags, alpm_trans_cb_event cb_event, alpm_trans_cb_conv conv, alpm_trans_cb_progress cb_progress); Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.30 pacman-lib/lib/libalpm/be_files.c:1.31 --- pacman-lib/lib/libalpm/be_files.c:1.30 Wed Feb 21 23:42:59 2007 +++ pacman-lib/lib/libalpm/be_files.c Mon Feb 26 03:38:48 2007 @@ -106,7 +106,7 @@ rewinddir(db->handle); } -pmpkg_t *_alpm_db_scan(pmdb_t *db, char *target, pmdbinfrq_t inforeq) +pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target, pmdbinfrq_t inforeq) { struct dirent *ent = NULL; struct stat sbuf; Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.34 pacman-lib/lib/libalpm/cache.c:1.35 --- pacman-lib/lib/libalpm/cache.c:1.34 Thu Feb 22 01:36:05 2007 +++ pacman-lib/lib/libalpm/cache.c Mon Feb 26 03:38:48 2007 @@ -187,7 +187,7 @@ return(0); } -pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, char *target) +pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) { ALPM_LOG_FUNC; @@ -201,7 +201,7 @@ return(NULL); } - return(_alpm_pkg_isin(target, pkgcache)); + return(_alpm_pkg_find(target, pkgcache)); } /* Returns a new group cache from db. @@ -286,7 +286,7 @@ return(db->grpcache); } -pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, char *target) +pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target) { alpm_list_t *i; Index: pacman-lib/lib/libalpm/cache.h diff -u pacman-lib/lib/libalpm/cache.h:1.10 pacman-lib/lib/libalpm/cache.h:1.11 --- pacman-lib/lib/libalpm/cache.h:1.10 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/cache.h Mon Feb 26 03:38:48 2007 @@ -33,12 +33,12 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg); alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db, pmdbinfrq_t infolevel); int _alpm_db_ensure_pkgcache(pmdb_t *db, pmdbinfrq_t infolevel); -pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, char *target); +pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target); /* groups */ int _alpm_db_load_grpcache(pmdb_t *db); void _alpm_db_free_grpcache(pmdb_t *db); alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db); -pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, char *target); +pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target); #endif /* _ALPM_CACHE_H */ Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.60 pacman-lib/lib/libalpm/db.c:1.61 --- pacman-lib/lib/libalpm/db.c:1.60 Wed Feb 21 01:44:14 2007 +++ pacman-lib/lib/libalpm/db.c Mon Feb 26 03:38:48 2007 @@ -51,7 +51,7 @@ #include "cache.h" #include "alpm.h" -pmdb_t *_alpm_db_new(char *root, char* dbpath, char *treename) +pmdb_t *_alpm_db_new(const char *root, const char *dbpath, const char *treename) { pmdb_t *db; @@ -150,7 +150,7 @@ return(ret); } -pmdb_t *_alpm_db_register(char *treename, alpm_cb_db_register callback) +pmdb_t *_alpm_db_register(const char *treename, alpm_cb_db_register callback) { struct stat buf; pmdb_t *db; Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.25 pacman-lib/lib/libalpm/db.h:1.26 --- pacman-lib/lib/libalpm/db.h:1.25 Wed Feb 21 03:34:36 2007 +++ pacman-lib/lib/libalpm/db.h Mon Feb 26 03:38:48 2007 @@ -47,18 +47,18 @@ }; /* db.c, database general calls */ -pmdb_t *_alpm_db_new(char *root, char *dbpath, char *treename); +pmdb_t *_alpm_db_new(const char *root, const char *dbpath, const char *treename); void _alpm_db_free(void *data); int _alpm_db_cmp(const void *db1, const void *db2); alpm_list_t *_alpm_db_search(pmdb_t *db, alpm_list_t *needles); -pmdb_t *_alpm_db_register(char *treename, alpm_cb_db_register callback); +pmdb_t *_alpm_db_register(const char *treename, alpm_cb_db_register callback); /* be.c, backend specific calls */ int _alpm_db_install(pmdb_t *db, const char *dbfile); int _alpm_db_open(pmdb_t *db); void _alpm_db_close(pmdb_t *db); void _alpm_db_rewind(pmdb_t *db); -pmpkg_t *_alpm_db_scan(pmdb_t *db, char *target, pmdbinfrq_t inforeq); +pmpkg_t *_alpm_db_scan(pmdb_t *db, const char *target, pmdbinfrq_t inforeq); int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_db_remove(pmdb_t *db, pmpkg_t *info); Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.69 pacman-lib/lib/libalpm/deps.c:1.70 --- pacman-lib/lib/libalpm/deps.c:1.69 Wed Feb 21 03:34:36 2007 +++ pacman-lib/lib/libalpm/deps.c Mon Feb 26 03:38:48 2007 @@ -150,7 +150,7 @@ for(k = i->next; k; k = k->next) { q = (pmpkg_t *)k->data; if(!strcmp(dep.name, q->name)) { - if(!_alpm_pkg_isin(q->name, tmptargs)) { + if(!_alpm_pkg_find(q->name, tmptargs)) { change = 1; tmptargs = alpm_list_add(tmptargs, q); } @@ -158,7 +158,7 @@ } for(l = q->provides; l; l = l->next) { if(!strcmp(dep.name, (char*)l->data)) { - if(!_alpm_pkg_isin((char*)l->data, tmptargs)) { + if(!_alpm_pkg_find((char*)l->data, tmptargs)) { change = 1; tmptargs = alpm_list_add(tmptargs, q); } @@ -167,7 +167,7 @@ } } } - if(!_alpm_pkg_isin(p->name, tmptargs)) { + if(!_alpm_pkg_find(p->name, tmptargs)) { tmptargs = alpm_list_add(tmptargs, p); } } @@ -231,7 +231,7 @@ /* hmmm... package isn't installed.. */ continue; } - if(_alpm_pkg_isin(p->name, packages)) { + if(_alpm_pkg_find(p->name, packages)) { /* this package also in the upgrade list, so don't worry about it */ continue; } @@ -443,7 +443,7 @@ { alpm_list_t *i; - if(_alpm_pkg_isin(pkg->name, targets)) { + if(_alpm_pkg_find(pkg->name, targets)) { return(0); } @@ -456,7 +456,7 @@ /* see if other packages need it */ for(i = alpm_pkg_get_requiredby(pkg); i; i = i->next) { pmpkg_t *reqpkg = _alpm_db_get_pkgfromcache(db, i->data); - if(reqpkg && !_alpm_pkg_isin(reqpkg->name, targets)) { + if(reqpkg && !_alpm_pkg_find(reqpkg->name, targets)) { return(0); } } @@ -606,14 +606,14 @@ pm_errno = PM_ERR_UNSATISFIED_DEPS; goto error; } - if(_alpm_pkg_isin(sync->name, list)) { + if(_alpm_pkg_find(sync->name, list)) { /* this dep is already in the target list */ _alpm_log(PM_LOG_DEBUG, _("dependency %s is already in the target list -- skipping"), sync->name); continue; } - if(!_alpm_pkg_isin(sync->name, trail)) { + if(!_alpm_pkg_find(sync->name, trail)) { /* check pmo_ignorepkg and pmo_s_ignore to make sure we haven't pulled in * something we're not supposed to. */ Index: pacman-lib/lib/libalpm/group.c diff -u pacman-lib/lib/libalpm/group.c:1.14 pacman-lib/lib/libalpm/group.c:1.15 --- pacman-lib/lib/libalpm/group.c:1.14 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/group.c Mon Feb 26 03:38:48 2007 @@ -84,7 +84,7 @@ return grp->name; } -alpm_list_t SYMEXPORT *alpm_grp_get_packages(pmgrp_t *grp) +alpm_list_t SYMEXPORT *alpm_grp_get_pkgs(pmgrp_t *grp) { ALPM_LOG_FUNC; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.77 pacman-lib/lib/libalpm/package.c:1.78 --- pacman-lib/lib/libalpm/package.c:1.77 Fri Feb 23 03:00:06 2007 +++ pacman-lib/lib/libalpm/package.c Mon Feb 26 03:38:48 2007 @@ -182,12 +182,12 @@ * Returns: 0 on success, 1 on error * */ -static int parse_descfile(char *descfile, pmpkg_t *info) +static int parse_descfile(const char *descfile, pmpkg_t *info) { FILE* fp = NULL; char line[PATH_MAX]; - char* ptr = NULL; - char* key = NULL; + char *ptr = NULL; + char *key = NULL; int linenum = 0; ALPM_LOG_FUNC; @@ -278,7 +278,7 @@ return(0); } -pmpkg_t *_alpm_pkg_load(char *pkgfile) +pmpkg_t *_alpm_pkg_load(const char *pkgfile) { char *expath; int ret = ARCHIVE_OK; @@ -453,7 +453,7 @@ /* Test for existence of a package in a alpm_list_t* * of pmpkg_t* */ -pmpkg_t *_alpm_pkg_isin(char *needle, alpm_list_t *haystack) +pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack) { alpm_list_t *lp; @@ -473,9 +473,10 @@ return(NULL); } -int _alpm_pkg_splitname(char *target, char *name, char *version, int witharch) +int _alpm_pkg_splitname(const char *target, char *name, char *version, int witharch) { char tmp[PKG_FULLNAME_LEN+7]; + const char *t; char *p, *q; ALPM_LOG_FUNC; @@ -485,12 +486,12 @@ } /* trim path name (if any) */ - if((p = strrchr(target, '/')) == NULL) { - p = target; + if((t = strrchr(target, '/')) == NULL) { + t = target; } else { - p++; + t++; } - STRNCPY(tmp, p, PKG_FULLNAME_LEN+7); + STRNCPY(tmp, t, PKG_FULLNAME_LEN+7); /* trim file extension (if any) */ if((p = strstr(tmp, PM_EXT_PKG))) { *p = '\0'; Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.32 pacman-lib/lib/libalpm/package.h:1.33 --- pacman-lib/lib/libalpm/package.h:1.32 Thu Feb 22 21:10:56 2007 +++ pacman-lib/lib/libalpm/package.h Mon Feb 26 03:38:48 2007 @@ -103,9 +103,9 @@ void _alpm_pkg_free(void *data); int _alpm_pkg_cmp(const void *p1, const void *p2); int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); -pmpkg_t *_alpm_pkg_load(char *pkgfile); -pmpkg_t *_alpm_pkg_isin(char *needle, alpm_list_t *haystack); -int _alpm_pkg_splitname(char *target, char *name, char *version, int witharch); +pmpkg_t *_alpm_pkg_load(const char *pkgfile); +pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack); +int _alpm_pkg_splitname(const char *target, char *name, char *version, int witharch); int _alpm_pkg_istoonew(pmpkg_t *pkg); void _alpm_pkg_update_requiredby(pmpkg_t *pkg); Index: pacman-lib/lib/libalpm/provide.c diff -u pacman-lib/lib/libalpm/provide.c:1.10 pacman-lib/lib/libalpm/provide.c:1.11 --- pacman-lib/lib/libalpm/provide.c:1.10 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/provide.c Mon Feb 26 03:38:48 2007 @@ -31,7 +31,7 @@ /* return a alpm_list_t of packages in "db" that provide "package" */ -alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, char *package) +alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) { alpm_list_t *pkgs = NULL; alpm_list_t *lp; Index: pacman-lib/lib/libalpm/provide.h diff -u pacman-lib/lib/libalpm/provide.h:1.5 pacman-lib/lib/libalpm/provide.h:1.6 --- pacman-lib/lib/libalpm/provide.h:1.5 Fri Jan 19 04:28:45 2007 +++ pacman-lib/lib/libalpm/provide.h Mon Feb 26 03:38:48 2007 @@ -25,7 +25,7 @@ #include "alpm_list.h" #include "config.h" -alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, char *package); +alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package); #endif /* _ALPM_PROVIDE_H */ Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.69 pacman-lib/lib/libalpm/remove.c:1.70 --- pacman-lib/lib/libalpm/remove.c:1.69 Wed Feb 21 01:44:15 2007 +++ pacman-lib/lib/libalpm/remove.c Mon Feb 26 03:38:48 2007 @@ -69,7 +69,7 @@ ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_alpm_pkg_isin(name, trans->packages)) { + if(_alpm_pkg_find(name, trans->packages)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.104 pacman-lib/lib/libalpm/sync.c:1.105 --- pacman-lib/lib/libalpm/sync.c:1.104 Fri Feb 23 02:53:25 2007 +++ pacman-lib/lib/libalpm/sync.c Mon Feb 26 03:38:48 2007 @@ -221,7 +221,7 @@ for(j = trans->packages; j && !replace; j=j->next) { sync = j->data; if(sync->type == PM_SYNC_TYPE_REPLACE) { - if(_alpm_pkg_isin(spkg->name, sync->data)) { + if(_alpm_pkg_find(spkg->name, sync->data)) { replace=1; } } @@ -501,7 +501,7 @@ for(j = trans->packages; j && !found; j = j->next) { sync = j->data; if(sync->type == PM_SYNC_TYPE_REPLACE) { - if(_alpm_pkg_isin(miss->depend.name, sync->data)) { + if(_alpm_pkg_find(miss->depend.name, sync->data)) { found = 1; } } @@ -929,7 +929,7 @@ alpm_list_t *j; for(j = sync->data; j; j = j->next) { pmpkg_t *pkg = j->data; - if(!_alpm_pkg_isin(pkg->name, tr->packages)) { + if(!_alpm_pkg_find(pkg->name, tr->packages)) { if(_alpm_trans_addtarget(tr, pkg->name) == -1) { goto error; } @@ -1072,7 +1072,7 @@ return sync->type; } -pmpkg_t SYMEXPORT *alpm_sync_get_package(pmsyncpkg_t *sync) +pmpkg_t SYMEXPORT *alpm_sync_get_pkg(pmsyncpkg_t *sync) { /* Sanity checks */ ASSERT(sync != NULL, return(NULL)); Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.37 pacman-lib/lib/libalpm/trans.c:1.38 --- pacman-lib/lib/libalpm/trans.c:1.37 Wed Feb 21 03:34:37 2007 +++ pacman-lib/lib/libalpm/trans.c Mon Feb 26 03:38:48 2007 @@ -270,7 +270,7 @@ } if(trans->packages && trans->type == PM_TRANS_TYPE_REMOVE) { - if(_alpm_pkg_isin(dep.name, handle->trans->packages)) { + if(_alpm_pkg_find(dep.name, handle->trans->packages)) { continue; } } @@ -364,7 +364,7 @@ return handle->trans->targets; } -alpm_list_t SYMEXPORT * alpm_trans_get_packages() +alpm_list_t SYMEXPORT * alpm_trans_get_pkgs() { /* Sanity checks */ ASSERT(handle != NULL, return(NULL));

1 0

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

26 Feb '07

Date: Monday, February 26, 2007 @ 03:33:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pmdb.py (1.3 -> 1.4) tests/sync131.py (1.1 -> 1.2) * Writing 'replaces' info to both /desc and /depends files for testing - see the "replaces confusion" thread on pacman-dev for more information * Cleaned up some 2 item loops in the sync131 test ------------------+ pmdb.py | 2 ++ tests/sync131.py | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) Index: pacman-lib/pactest/pmdb.py diff -u pacman-lib/pactest/pmdb.py:1.3 pacman-lib/pactest/pmdb.py:1.4 --- pacman-lib/pactest/pmdb.py:1.3 Mon Feb 26 03:19:02 2007 +++ pacman-lib/pactest/pmdb.py Mon Feb 26 03:33:48 2007 @@ -251,6 +251,8 @@ if pkg.reason: data.append(_mksection("REASON", pkg.reason)) else: + if pkg.replaces: + data.append(_mksection("REPLACES", pkg.replaces)) if pkg.csize: data.append(_mksection("CSIZE", pkg.csize)) if pkg.md5sum: Index: pacman-lib/pactest/tests/sync131.py diff -u pacman-lib/pactest/tests/sync131.py:1.1 pacman-lib/pactest/tests/sync131.py:1.2 --- pacman-lib/pactest/tests/sync131.py:1.1 Sun Oct 15 15:04:31 2006 +++ pacman-lib/pactest/tests/sync131.py Mon Feb 26 03:33:48 2007 @@ -2,18 +2,17 @@ sp = pmpkg("pkg4") sp.replaces = ["pkg1", "pkg2", "pkg3"] - self.addpkg2db("sync", sp) lp1 = pmpkg("pkg1") -lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp1) -for p in lp1, lp2: - self.addpkg2db("local", p) +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) self.args = "-Su" self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg4") -for p in lp1, lp2: - self.addrule("!PKG_EXIST=%s" % p.name) +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2")

1 0

[pacman-dev] CVS update of pacman-lib/pactest (6 files)
by Aaron Griffin 26 Feb '07

26 Feb '07

Date: Monday, February 26, 2007 @ 03:19:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pmdb.py (1.2 -> 1.3) pmenv.py (1.5 -> 1.6) pmfile.py (1.2 -> 1.3) pmrule.py (1.2 -> 1.3) pmtest.py (1.4 -> 1.5) util.py (1.2 -> 1.3) * corrected (IMO) --debug usage with pactest. --debug is now passed straight through to pacman, whereas --verbose affects the pactest output - this cleans up the standard test output significantly * sorted tests a bit better, sectioning off failed tests AFTER successful tests, to make it easier to see what failed at a glance * added a 'testname' member to pmtest, which strips path info (cleaner output) -----------+ pmdb.py | 4 ++-- pmenv.py | 40 +++++++++++++++++++++++++--------------- pmfile.py | 7 +++---- pmrule.py | 4 ++-- pmtest.py | 9 ++++++--- util.py | 8 -------- 6 files changed, 38 insertions(+), 34 deletions(-) Index: pacman-lib/pactest/pmdb.py diff -u pacman-lib/pactest/pmdb.py:1.2 pacman-lib/pactest/pmdb.py:1.3 --- pacman-lib/pactest/pmdb.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmdb.py Mon Feb 26 03:19:02 2007 @@ -344,8 +344,8 @@ if not oldpkg: return 0 - #dbg("oldpkg.checksum : %s" % oldpkg.checksum) - #dbg("oldpkg.mtime : %s" % oldpkg.mtime) + vprint("\toldpkg.checksum : %s" % oldpkg.checksum) + vprint("\toldpkg.mtime : %s" % oldpkg.mtime) for key in pkg.mtime.keys(): if key == "install" \ Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.5 pacman-lib/pactest/pmenv.py:1.6 --- pacman-lib/pactest/pmenv.py:1.5 Fri Feb 23 01:50:42 2007 +++ pacman-lib/pactest/pmenv.py Mon Feb 26 03:19:02 2007 @@ -19,6 +19,7 @@ import os +import os.path import time import pmtest @@ -59,7 +60,7 @@ for t in self.testcases: print "=========="*8 - print "Running '%s'" % t.name.replace(".py", "") + print "Running '%s'" % t.testname t.load() print t.description @@ -88,33 +89,42 @@ """ """ passed = 0 - print "=========="*8 - print "Results" - print "----------"*8 + tpassed = [] + tfailed = [] for test in self.testcases: + fail = test.result["fail"] + if fail == 0: + passed += 1 + tpassed.append(test) + else: + tfailed.append(test) + + def _printtest(t): success = test.result["success"] fail = test.result["fail"] rules = len(test.rules) if fail == 0: print "[PASSED]", - passed += 1 else: print "[FAILED]", - print test.name.replace(".py", "").ljust(33), - print "Rules:", - print "OK = %2u FAIL = %2u SKIP = %2u" % \ - (success, fail, rules - (success + fail)) + print "%s Rules:OK = %2u FAIL = %2u SKIP = %2u" \ + % (test.testname.ljust(32), success, fail, rules - (success + fail)) + + print "=========="*8 + print "Results" print "----------"*8 + for test in tpassed: _printtest(test) + print "----------"*8 + for test in tfailed: _printtest(test) + print "----------"*8 + total = len(self.testcases) failed = total - passed print "TOTAL = %3u" % total if total: - print "PASSED = %3u (%6.2f%%)" % \ - (passed, float(passed) * 100 / total) - print "FAILED = %3u (%6.2f%%)" % \ - (failed, float(failed) * 100 / total) - print - + print "PASSED = %3u (%6.2f%%)" % (passed, float(passed) * 100 / total) + print "FAILED = %3u (%6.2f%%)" % (failed, float(failed) * 100 / total) + print "" if __name__ == "__main__": env = pmenv("/tmp") Index: pacman-lib/pactest/pmfile.py diff -u pacman-lib/pactest/pmfile.py:1.2 pacman-lib/pactest/pmfile.py:1.3 --- pacman-lib/pactest/pmfile.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmfile.py Mon Feb 26 03:19:02 2007 @@ -48,10 +48,9 @@ checksum = getmd5sum(filename) mtime = getmtime(filename) - if debug: - print "ismodified(%s)" % self.name - print "old: %s / %s" % (self.checksum, self.mtime) - print "new: %s / %s" % (checksum, mtime) + vprint("\tismodified(%s)" % self.name) + vprint("\t\told: %s / %s" % (self.checksum, self.mtime)) + vprint("\t\tnew: %s / %s" % (checksum, mtime)) if not self.checksum == checksum \ or not (self.mtime[1], self.mtime[2]) == (mtime[1], mtime[2]): Index: pacman-lib/pactest/pmrule.py diff -u pacman-lib/pactest/pmrule.py:1.2 pacman-lib/pactest/pmrule.py:1.3 --- pacman-lib/pactest/pmrule.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmrule.py Mon Feb 26 03:19:02 2007 @@ -63,8 +63,8 @@ if not newpkg: success = 0 else: - #dbg("newpkg.checksum : %s" % newpkg.checksum) - #dbg("newpkg.mtime : %s" % newpkg.mtime) + vprint("\tnewpkg.checksum : %s" % newpkg.checksum) + vprint("\tnewpkg.mtime : %s" % newpkg.mtime) if case == "EXIST": success = 1 elif case == "MODIFIED": Index: pacman-lib/pactest/pmtest.py diff -u pacman-lib/pactest/pmtest.py:1.4 pacman-lib/pactest/pmtest.py:1.5 --- pacman-lib/pactest/pmtest.py:1.4 Thu Feb 22 23:54:49 2007 +++ pacman-lib/pactest/pmtest.py Mon Feb 26 03:19:03 2007 @@ -19,6 +19,7 @@ import os +import os.path import shutil import time @@ -35,11 +36,13 @@ def __init__(self, name, root): self.name = name + self.testname = os.path.basename(name).replace('.py', '') self.root = root def __str__(self): return "name = %s\n" \ - "root = %s" % (self.name, self.root) + "testname = %s\n" \ + "root = %s" % (self.name, self.testname, self.root) def addpkg2db(self, treename, pkg): """ @@ -197,7 +200,7 @@ cmd.append("%s" % self.args) if not pacman["gdb"] and not pacman["valgrind"] and not pacman["nolog"]: cmd.append(">%s 2>&1" % os.path.join(self.root, LOGFILE)) - dbg(" ".join(cmd)) + vprint("\trunning: %s" % " ".join(cmd)) # Change to the tmp dir before running pacman, so that local package # archives are made available more easily. @@ -214,7 +217,7 @@ self.retcode = 0 else: self.retcode /= 256 - dbg("retcode = %s" % self.retcode) + vprint("\tretcode = %s" % self.retcode) os.chdir(curdir) # Check if pacman failed because of bad permissions Index: pacman-lib/pactest/util.py diff -u pacman-lib/pactest/util.py:1.2 pacman-lib/pactest/util.py:1.3 --- pacman-lib/pactest/util.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/util.py Mon Feb 26 03:19:03 2007 @@ -43,10 +43,7 @@ SYNCREPO = "var/pub" LOGFILE = "var/log/pactest.log" - verbose = 0 -debug = 1 - def err(msg): print "error: " + msg @@ -56,11 +53,6 @@ if verbose: print msg -def dbg(msg): - if debug: - print msg - - # # Methods to generate files #

1 0

[pacman-dev] (Most likely) final RC before going to testing
by Aaron Griffin 25 Feb '07

25 Feb '07

This RC fixes the way conflicts and backups are handled. It should work correctly and more efficiently. In addition, backups are proactive. That is, adding backup=() to a package does not require a full release cycle to take effect. In addition, this RC passes all pactest tests (it seems I forgot pactest existed, heh). All major bugs should be closed, and everything should work correctly. The bug catcher is here: http://bugs.archlinux.org/task/6316 The only remain items are rebuilding the developer tools and official repo scripts to use the new tools. In all honesty, that should be quick, and isn't required until we go live. So, test this out. Let me know if there's any issues: http://archlinux.org/~aaron/pacman/pacman-rc-2007.02.21-1-i686.pkg.tar.gz For those who don't know, this package installs side-by-side with the current pacman. All commands, configs, and man pages are renamed with '3' appended (pacman3, makepkg3, /etc/pacman3.conf). When this goes to testing, this will NOT be the case. Enjoy, Aaron

5 12

[pacman-dev] CVS update of pacman-lib/doc (pacman.8)
by Dan McGee 25 Feb '07

25 Feb '07

Date: Saturday, February 24, 2007 @ 18:40:38 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.8 (1.7 -> 1.8) * Added some undocumented options to the manpage. ----------+ pacman.8 | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.7 pacman-lib/doc/pacman.8:1.8 --- pacman-lib/doc/pacman.8:1.7 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/pacman.8 Sat Feb 24 18:40:38 2007 @@ -25,10 +25,10 @@ .SH OPERATIONS .TP .B \-A, --add (deprecated) -Add a package to the system. The package will be uncompressed into the -installation root and the database will be updated. The package will not be -installed if another version is already installed. Please use \fB--upgrade\fP -in place of this option. +Add a package to the system. Either a URL or file path can be specified. The +package will be uncompressed into the installation root and the database will +be updated. The package will not be installed if another version is already +installed. NOTE: please use \fB--upgrade\fP in place of this option. .TP .B \-F, --freshen This is like \fB--upgrade\fP except it will only upgrade packages already @@ -42,22 +42,22 @@ packages. See \fBQUERY OPTIONS\fP below. .TP .B \-R, --remove -Remove a package from the system. Files belonging to the specified package -will be deleted, and the database will be updated. Most configuration files +Remove a package from the system. Files belonging to the specified package +will be deleted, and the database will be updated. Most configuration files will be saved with a \fI.pacsave\fP extension unless the \fB--nosave\fP option is used. See \fBREMOVE OPTIONS\fP below. .TP .B \-S, --sync Synchronize packages. Packages are installed directly from the ftp servers, -including all dependencies required to run the packages. For example, +including all dependencies required to run the packages. For example, \fBpacman -S qt\fP will download and install \fBqt\fP and all the packages it depends on. You can also use \fBpacman -Su\fP to upgrade all packages that are out of date. See \fBSYNC OPTIONS\fP below. .TP .B \-U, --upgrade -Upgrade or add a package to the system. This is a "remove-then-add" process. -See \fBHANDLING CONFIG FILES\fP for an explanation on how pacman takes care of -config files. +Upgrade or add a package to the system. Either a URL or file path can be +specified. This is a "remove-then-add" process. See \fBHANDLING CONFIG +FILES\fP for an explanation on how pacman takes care of config files. .TP .B \-V, --version Display version and exit. @@ -167,8 +167,9 @@ packages from the cache. .TP .B \-g, --groups -Display all the members for each package group specified. If no group names are -provided, all groups will be listed. +Display all the members for each package group specified. If no group names +are provided, all groups will be listed; pass the flag twice to view all +groups and their members. .TP .B \-i, --info Display dependency and other information for a given package. This will search @@ -199,8 +200,10 @@ .TP .B \-y, --refresh Download a fresh copy of the master package list from the server(s) defined in -\fBpacman.conf\fP. This should typically be used each time you use -\fB--sysupgrade\fP. +\fBpacman.conf\fP. This should typically be used each time you use +\fB--sysupgrade\fP or \fB-u\fP. Passing two \fB--refresh\fP or \fB-y\fP flags +will force a refresh of all package lists even if they are thought to be +up to date. .TP .B \--ignore \fIpackage\fP Directs \fBpacman\fP to ignore upgrades of \fIpackage\fP even if there is one

1 0