- Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg fix
by James Rosten 20 Mar '07

20 Mar '07

If I tell makepkg to install missing deps with pacman and then tell pacman not to install, makepkg keeps going. So I made --noconfirm a default $PACMAN_OPTS. Patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> Index: scripts/makepkg =================================================================== RCS file: /home/cvs-pacman/pacman-lib/scripts/makepkg,v retrieving revision 1.60 diff -u -r1.60 makepkg --- OLD/scripts/makepkg 18 Mar 2007 23:09:50 -0000 1.60 +++ NEW/scripts/makepkg 18 Mar 2007 23:11:58 -0000 @@ -50,7 +50,7 @@ REPKG=0 LOGGING=0 -PACMAN_OPTS= +PACMAN_OPTS="--noconfirm" #determine if we are running with fakeroot if [ "$1" = "-F" ]; then @@ -376,7 +376,6 @@ echo echo "These options can be passed to pacman:" echo - echo " --noconfirm Do not ask for confirmation when resolving dependencies" echo " --noprogressbar Do not show a progress bar when downloading files" echo echo "If -p is not specified, makepkg will look for '$BUILDSCRIPT'" @@ -411,7 +410,6 @@ while [ "$#" -ne "0" ]; do case $1 in # pacman - --noconfirm) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; # makepkg --clean) CLEANUP=1 ;;

2 1

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 20 Mar '07

20 Mar '07

Date: Monday, March 19, 2007 @ 22:13:44 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.62 -> 1.63) * makepkg: a few more changes to get dependencies working correctly. If a user does not install all required dependencies, makepkg will now bail. ---------+ makepkg | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.62 pacman-lib/scripts/makepkg:1.63 --- pacman-lib/scripts/makepkg:1.62 Mon Mar 19 21:34:16 2007 +++ pacman-lib/scripts/makepkg Mon Mar 19 22:13:44 2007 @@ -217,7 +217,7 @@ fi sudo pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then - error "Failed to install missing dependencies." + error "Pacman failed to install missing dependencies." exit 1 fi if [ "$INFAKEROOT" = "1" ]; then @@ -229,7 +229,7 @@ msg "Installing missing dependencies..." pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then - error "Failed to install missing dependencies." + error "Pacman failed to install missing dependencies." exit 1 fi elif [ "$DEP_SRC" = "1" ]; then @@ -290,18 +290,24 @@ } resolvedeps() { + deplist="" + newdeplist="" + deplist=$(checkdeps $*) if [ -n "${deplist}" ]; then handledeps $deplist if [ $? -eq 0 ]; then # check deps again to make sure they were resolved - newdeplist=$(checkdeps ${depends[@]}) + newdeplist=$(checkdeps $*) if [ -n "${newdeplist}" ]; then - error "Failed to install missing dependencies." + error "Failed to install all missing dependencies." fi + else + newdeplist="$deplist" fi fi + # if new dep list is not empty, print the list if [ -n "${newdeplist}" ]; then msg "Missing Dependencies:" for dep in ${newdeplist}; do @@ -315,8 +321,8 @@ # fix flyspray bug #5923 removedeps() { - # runtimedeps and makedeps are set when resolving deps - local deplist="$runtimedeps $makedeps" + # runtimedeps and buildtimedeps are set when resolving deps + local deplist="$runtimedeps $buildtimedeps" local depstrip="" local striplist="" @@ -623,21 +629,23 @@ elif [ $(type -p pacman) ]; then deperr=0 # these two variables are needed later by removedeps - unset runtimedeps makedeps + unset runtimedeps buildtimedeps msg "Checking Runtime Dependencies..." resolvedeps ${depends[@]} + ret=$? # deplist is a global variable set by resolvedeps runtimedeps="$deplist" - if [ $? -ne 0 ]; then + if [ "$ret" != "0" ]; then deperr=1 fi msg "Checking Buildtime Dependencies..." resolvedeps ${makedepends[@]} + ret=$? # deplist is a global variable set by resolvedeps - makedeps="$deplist" - if [ $? -ne 0 ]; then + buildtimedeps="$deplist" + if [ "$ret" != "0" ]; then deperr=1 fi

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 20 Mar '07

20 Mar '07

Date: Monday, March 19, 2007 @ 21:34:16 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.61 -> 1.62) * makepkg: Fix behavior of -Ssr: deps were not being correctly removed before. ---------+ makepkg | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.61 pacman-lib/scripts/makepkg:1.62 --- pacman-lib/scripts/makepkg:1.61 Mon Mar 19 18:48:54 2007 +++ pacman-lib/scripts/makepkg Mon Mar 19 21:34:16 2007 @@ -177,9 +177,6 @@ } checkdeps() { - local missdep="" - local deplist="" - [ $# -gt 0 ] || return pmout=$(pacman $PACMAN_OPTS -T $*) @@ -196,6 +193,8 @@ handledeps() { local missingdeps=0 local deplist="$*" + local depstrip="" + local striplist="" local haveperm=0 if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then haveperm=1 @@ -296,16 +295,16 @@ handledeps $deplist if [ $? -eq 0 ]; then # check deps again to make sure they were resolved - deplist=$(checkdeps ${depends[@]}) - if [ -n "${deplist}" ]; then + newdeplist=$(checkdeps ${depends[@]}) + if [ -n "${newdeplist}" ]; then error "Failed to install missing dependencies." fi fi fi - if [ -n "${deplist}" ]; then + if [ -n "${newdeplist}" ]; then msg "Missing Dependencies:" - for dep in ${deplist}; do + for dep in ${newdeplist}; do msg2 "${dep}" done return 1 @@ -316,20 +315,30 @@ # fix flyspray bug #5923 removedeps() { - if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + # runtimedeps and makedeps are set when resolving deps + local deplist="$runtimedeps $makedeps" + local depstrip="" + local striplist="" + + for dep in $deplist; do + depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') + striplist="$striplist $depstrip" + done + + if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -Rs $makedeplist $deplist + sudo pacman $PACMAN_OPTS -Rs $striplist if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." - pacman $PACMAN_OPTS -Rs $makedeplist $deplist + pacman $PACMAN_OPTS -Rs $striplist fi } @@ -605,7 +614,6 @@ msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" -unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then if [ "$NODEPS" = "1" ]; then @@ -614,15 +622,21 @@ # skip printing a warning message for the others: geninteg, nobuild, repkg elif [ $(type -p pacman) ]; then deperr=0 + # these two variables are needed later by removedeps + unset runtimedeps makedeps msg "Checking Runtime Dependencies..." resolvedeps ${depends[@]} + # deplist is a global variable set by resolvedeps + runtimedeps="$deplist" if [ $? -ne 0 ]; then deperr=1 fi msg "Checking Buildtime Dependencies..." resolvedeps ${makedepends[@]} + # deplist is a global variable set by resolvedeps + makedeps="$deplist" if [ $? -ne 0 ]; then deperr=1 fi

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 19 Mar '07

19 Mar '07

Date: Monday, March 19, 2007 @ 18:48:54 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.60 -> 1.61) * makepkg: fix installation of dependencies with version comparitors. ---------+ makepkg | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.60 pacman-lib/scripts/makepkg:1.61 --- pacman-lib/scripts/makepkg:1.60 Sun Mar 18 19:09:50 2007 +++ pacman-lib/scripts/makepkg Mon Mar 19 18:48:54 2007 @@ -201,6 +201,11 @@ haveperm=1 fi + for dep in $deplist; do + depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') + striplist="$striplist $depstrip" + done + if [ "$deplist" != "" -a $haveperm -eq 1 ]; then if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then # install missing deps from binary packages (using pacman -S and sudo) @@ -211,7 +216,7 @@ FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -S $deplist + sudo pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then error "Failed to install missing dependencies." exit 1 @@ -223,7 +228,7 @@ elif [ "$DEP_BIN" = "1" ]; then # install missing deps from binary packages (using pacman -S) msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -S $deplist + pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then error "Failed to install missing dependencies." exit 1 @@ -237,7 +242,7 @@ fi # TODO: handle version comparators (eg, glibc>=2.2.5) msg "Building missing dependencies..." - for dep in $deplist; do + for dep in $striplist; do candidates=$(find $SRCROOT -type d -name "$dep") if [ "$candidates" = "" ]; then error "Could not find \"$dep\" under $SRCROOT"

1 0

[pacman-dev] Grammar bug in output
by Xilon 19 Mar '07

19 Mar '07

Trying to udpate the system I noticud this little bug: :: Starting full system upgrade... warning: apr-util: forcing upgrade to version 1.2.8-2 warning: dmenu: local (2.6-1) is newer than extra (2.2-1) resolving dependencies... done. error: failed to prepare transaction (could not satisfy dependencies) :: mpd is required by flac=1.1.2 It says that flac depends on mpd, while it is mpd that depends on flac. pacman -Qi flac <snip> Required By : libsndfile graveman mpd

2 1

[pacman-dev] CVS update of pacman-lib (TODO.dan)
by Dan McGee 19 Mar '07

19 Mar '07

Date: Monday, March 19, 2007 @ 00:54:58 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.17 -> 1.18) * TODO list updates. ----------+ TODO.dan | 8 -------- 1 file changed, 8 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.17 pacman-lib/TODO.dan:1.18 --- pacman-lib/TODO.dan:1.17 Tue Mar 13 17:05:01 2007 +++ pacman-lib/TODO.dan Mon Mar 19 00:54:58 2007 @@ -11,14 +11,6 @@ very least change references to BSD. -Pacman 3.0: ------------ - -ideas mentioned here- http://bbs.archlinux.org/viewtopic.php?id=29450- add a -.install message about mirrors, maybe comment whole file, encourage rankmirrors -usage - - Pacman 3.1: -----------

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (util.c)
by Aaron Griffin 19 Mar '07

19 Mar '07

Date: Monday, March 19, 2007 @ 00:49:28 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: util.c (1.49 -> 1.50) Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> * correct _alpm_rmrf usage with regard to symlinks and directories --------+ util.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.49 pacman-lib/lib/libalpm/util.c:1.50 --- pacman-lib/lib/libalpm/util.c:1.49 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/util.c Mon Mar 19 00:49:28 2007 @@ -310,21 +310,20 @@ struct dirent *dp; DIR *dirp; char name[PATH_MAX]; - struct stat st; + struct stat st; - if(stat(path, &st) == 0) { - if(S_ISREG(st.st_mode)) { + if(lstat(path, &st) == 0) { + if(!S_ISDIR(st.st_mode)) { if(!unlink(path)) { return(0); } else { if(errno == ENOENT) { return(0); } else { - /* not a directory */ return(1); } } - } else if(S_ISDIR(st.st_mode)) { + } else { if((dirp = opendir(path)) == (DIR *)-1) { return(1); }

1 0

[pacman-dev] output issue with requiredby when syncing
by James Rosten 19 Mar '07

19 Mar '07

This was reported by stonecrest in IRC and after a lengthy conversation with him and Dan and lots of digging through code and learning about the existance of cscope (very helpful by the way), I finally decided that because we use PM_DEP_TYPE_DEPEND and PM_DEP_TYPE_REQUIRED exactly the same way in the code (they are values of enum pmdeptype_t), that they can safely be merged, which I did. The patch is below, and I ran make check and everything but upgrade051.py passed (I'm not sure if its failure is already known about). Also in the process I wrote two new pactest cases, which are below also (my numbers for them were pure guesses on the numbering scheme). ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> ============================================================ --- OLD/lib/libalpm/alpm.h c03ac784425cc9f185b169790623bad258c518e6 +++ NEW/lib/libalpm/alpm.h 141e295deed23b259b3d92e04bf63bacffd1a896 @@ -371,7 +371,6 @@ typedef enum _pmdeptype_t { typedef enum _pmdeptype_t { PM_DEP_TYPE_DEPEND = 1, - PM_DEP_TYPE_REQUIRED, PM_DEP_TYPE_CONFLICT } pmdeptype_t; ============================================================ --- OLD/lib/libalpm/deps.c 065f3a78b9a5a454c73651416ce7cb03c59fcb54 +++ NEW/lib/libalpm/deps.c a5fb70e5573401f9ad4a0b8e6d9290dd0285eb59 @@ -288,7 +288,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t * if(!satisfied) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p)); - miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend->mod, + miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod, depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); @@ -408,7 +408,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t * if(!found) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), reqname, alpm_pkg_get_name(tp)); - miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_REQUIRED, + miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, PM_DEP_MOD_ANY, j->data, NULL); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); ============================================================ --- OLD/src/pacman/sync.c c5a404fc8494f5b8653d2c8e77911aa7735f0bf6 +++ NEW/src/pacman/sync.c b00cd269bd70e927cf1f4d29eec65f34b6296942 @@ -618,10 +618,8 @@ int pacman_sync(alpm_list_t *targets) case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - MSG(NL, ":: %s %s %s", alpm_dep_get_target(miss), - alpm_dep_get_type(miss) == PM_DEP_TYPE_DEPEND ? - _("requires") : _("is required by"), - alpm_dep_get_name(miss)); + MSG(NL, ":: %s %s %s", alpm_dep_get_target(miss), _("requires"), + alpm_dep_get_name(miss)); switch(alpm_dep_get_mod(miss)) { case PM_DEP_MOD_ANY: break; ============================================================ --- OLD/pactest/tests/sync1000.py 0403cb1f047ab45d519782f1124b5cc685823cdc +++ NEW/pactest/tests/sync1000.py 0403cb1f047ab45d519782f1124b5cc685823cdc @@ -0,0 +1,19 @@ +# If someone else can come up with a better name, please do so +self.description = "stonecrest's problem" + +sp = pmpkg("dummy", "1.1-1") +sp.requiredby = [ "pkg" ] +self.addpkg2db("sync", sp) + +lp1 = pmpkg("dummy", "1.0-1") +lp1.requiredby = [ "pkg" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg") +lp2.depends = [ "dummy=1.0" ] +self.addpkg2db("local", lp2) + +self.args = "-Su" + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("!PKG_VERSION=dummy|1.1-1") ============================================================ --- OLD/pactest/tests/upgrade058.py 5a35d3264695e5589384fe2624ebec27faaa468b +++ NEW/pactest/tests/upgrade058.py 5a35d3264695e5589384fe2624ebec27faaa468b @@ -0,0 +1,17 @@ +self.description = "Upgrade a package that's older version is required by another package." + +lp1 = pmpkg("pkg1") +lp1.depends = [ "pkg2=1.0" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2", "1.0-1") +lp2.requiredby = [ "pkg1" ] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.1-1") +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_VERSION=pkg2|1.1")

2 1

[pacman-dev] CVS update of pacman-lib (5 files)
by Aaron Griffin 19 Mar '07

19 Mar '07

Date: Monday, March 19, 2007 @ 00:23:45 Author: aaron Path: /home/cvs-pacman/pacman-lib Added: pactest/tests/sync1000.py (1.1) pactest/tests/upgrade058.py (1.1) Modified: lib/libalpm/alpm.h (1.81 -> 1.82) lib/libalpm/deps.c (1.79 -> 1.80) src/pacman/sync.c (1.116 -> 1.117) James Rosten <seinfeld90(a)gmail.com> * Two new pactest test cases * Fix some "required by" / "requires" output by unifying all "dependency types" to a single value (PM_DEP_TYPE_DEPEND) -----------------------------+ lib/libalpm/alpm.h | 1 - lib/libalpm/deps.c | 4 ++-- pactest/tests/sync1000.py | 19 +++++++++++++++++++ pactest/tests/upgrade058.py | 17 +++++++++++++++++ src/pacman/sync.c | 6 ++---- 5 files changed, 40 insertions(+), 7 deletions(-) Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.81 pacman-lib/lib/libalpm/alpm.h:1.82 --- pacman-lib/lib/libalpm/alpm.h:1.81 Wed Mar 7 02:45:30 2007 +++ pacman-lib/lib/libalpm/alpm.h Mon Mar 19 00:23:45 2007 @@ -371,7 +371,6 @@ typedef enum _pmdeptype_t { PM_DEP_TYPE_DEPEND = 1, - PM_DEP_TYPE_REQUIRED, PM_DEP_TYPE_CONFLICT } pmdeptype_t; Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.79 pacman-lib/lib/libalpm/deps.c:1.80 --- pacman-lib/lib/libalpm/deps.c:1.79 Mon Mar 12 01:55:14 2007 +++ pacman-lib/lib/libalpm/deps.c Mon Mar 19 00:23:45 2007 @@ -288,7 +288,7 @@ if(!satisfied) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p)); - miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend->mod, + miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod, depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); @@ -408,7 +408,7 @@ if(!found) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), reqname, alpm_pkg_get_name(tp)); - miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_REQUIRED, + miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, PM_DEP_MOD_ANY, j->data, NULL); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); Index: pacman-lib/pactest/tests/sync1000.py diff -u /dev/null pacman-lib/pactest/tests/sync1000.py:1.1 --- /dev/null Mon Mar 19 00:23:45 2007 +++ pacman-lib/pactest/tests/sync1000.py Mon Mar 19 00:23:45 2007 @@ -0,0 +1,19 @@ +# If someone else can come up with a better name, please do so +self.description = "stonecrest's problem" + +sp = pmpkg("dummy", "1.1-1") +sp.requiredby = [ "pkg" ] +self.addpkg2db("sync", sp) + +lp1 = pmpkg("dummy", "1.0-1") +lp1.requiredby = [ "pkg" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg") +lp2.depends = [ "dummy=1.0" ] +self.addpkg2db("local", lp2) + +self.args = "-Su" + +self.addrule("!PACMAN_RETCODE=0") +self.addrule("!PKG_VERSION=dummy|1.1-1") Index: pacman-lib/pactest/tests/upgrade058.py diff -u /dev/null pacman-lib/pactest/tests/upgrade058.py:1.1 --- /dev/null Mon Mar 19 00:23:45 2007 +++ pacman-lib/pactest/tests/upgrade058.py Mon Mar 19 00:23:45 2007 @@ -0,0 +1,17 @@ +self.description = "Upgrade a package that's older version is required by another package." + +lp1 = pmpkg("pkg1") +lp1.depends = [ "pkg2=1.0" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2", "1.0-1") +lp2.requiredby = [ "pkg1" ] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.1-1") +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_VERSION=pkg2|1.1") Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.116 pacman-lib/src/pacman/sync.c:1.117 --- pacman-lib/src/pacman/sync.c:1.116 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/sync.c Mon Mar 19 00:23:45 2007 @@ -618,10 +618,8 @@ case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - MSG(NL, ":: %s %s %s", alpm_dep_get_target(miss), - alpm_dep_get_type(miss) == PM_DEP_TYPE_DEPEND ? - _("requires") : _("is required by"), - alpm_dep_get_name(miss)); + MSG(NL, ":: %s %s %s", alpm_dep_get_target(miss), _("requires"), + alpm_dep_get_name(miss)); switch(alpm_dep_get_mod(miss)) { case PM_DEP_MOD_ANY: break;

1 0

[pacman-dev] CVS update of pacman-lib (8 files)
by Dan McGee 19 Mar '07

19 Mar '07

Date: Sunday, March 18, 2007 @ 22:45:01 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: doc/pacman.8 (1.9 -> 1.10) src/pacman/pacman.c (1.106 -> 1.107) src/pacman/po/de.po (1.14 -> 1.15) src/pacman/po/en_GB.po (1.2 -> 1.3) src/pacman/po/fr.po (1.10 -> 1.11) src/pacman/po/hu.po (1.11 -> 1.12) src/pacman/po/it.po (1.16 -> 1.17) src/pacman/trans.c (1.43 -> 1.44) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> * Many minor issues mentioned by Scott Horowitz <stonecrest(a)gmail.com>. - extra 'done' text in --noprogressbar output - missing flags in the pacman.8 manpage - unclear text in --noconfirm help description ------------------------+ doc/pacman.8 | 13 +++++++++++++ src/pacman/pacman.c | 2 +- src/pacman/po/de.po | 2 +- src/pacman/po/en_GB.po | 4 ++-- src/pacman/po/fr.po | 2 +- src/pacman/po/hu.po | 2 +- src/pacman/po/it.po | 14 +++++++------- src/pacman/trans.c | 3 --- 8 files changed, 26 insertions(+), 16 deletions(-) Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.9 pacman-lib/doc/pacman.8:1.10 --- pacman-lib/doc/pacman.8:1.9 Sun Mar 11 16:53:50 2007 +++ pacman-lib/doc/pacman.8 Sun Mar 18 22:45:00 2007 @@ -68,6 +68,11 @@ .SH OPTIONS .TP +.B \--ask \fInumber\fP +Pre-specify answers to questions. It is doubtful whether this option even +works, so I would not recommend using it. TODO: document this more, as I have +no idea how it works or when you would use it, or if we should just dump it. +.TP .B \-b, --dbpath \fIpath\fP Specify an alternative database location (default is "/var/lib/pacman/"). This should not be used unless you know what you are doing. @@ -109,9 +114,17 @@ .B \--noprogressbar Do not show a progress bar when downloading files. This can be useful for scripts that call pacman and capture the output. +.TP +.B \--noscriptlet +If an install scriptlet exists, do not execute it. Do not use this unless you +know what you are doing. .SH QUERY OPTIONS .TP +.B \-c, --changelog +View the ChangeLog of a package. Not every package will provide one but it +will be shown if available. +.TP .B \-e, --orphans List all packages that were pulled in by a previously installed package but no longer required by any installed package. Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.106 pacman-lib/src/pacman/pacman.c:1.107 --- pacman-lib/src/pacman/pacman.c:1.106 Sun Mar 18 19:21:57 2007 +++ pacman-lib/src/pacman/pacman.c Sun Mar 18 22:45:00 2007 @@ -151,7 +151,7 @@ printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); } printf(_(" --config <path> set an alternate configuration file\n")); - printf(_(" --noconfirm do not ask for anything confirmation\n")); + printf(_(" --noconfirm do not ask for any confirmation\n")); printf(_(" --ask <number> pre-specify answers for questions (see manpage)\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); printf(_(" --noscriptlet do not execute the install scriptlet if there is any\n")); Index: pacman-lib/src/pacman/po/de.po diff -u pacman-lib/src/pacman/po/de.po:1.14 pacman-lib/src/pacman/po/de.po:1.15 --- pacman-lib/src/pacman/po/de.po:1.14 Wed Mar 7 11:36:43 2007 +++ pacman-lib/src/pacman/po/de.po Sun Mar 18 22:45:01 2007 @@ -556,7 +556,7 @@ #: src/pacman/pacman.c:153 #, c-format -msgid " --noconfirm do not ask for anything confirmation\n" +msgid " --noconfirm do not ask for any confirmation\n" msgstr " --noconfirm Niemals nach einer BestÃ€tigung fragen\n" #: src/pacman/pacman.c:154 Index: pacman-lib/src/pacman/po/en_GB.po diff -u pacman-lib/src/pacman/po/en_GB.po:1.2 pacman-lib/src/pacman/po/en_GB.po:1.3 --- pacman-lib/src/pacman/po/en_GB.po:1.2 Wed Mar 7 11:57:23 2007 +++ pacman-lib/src/pacman/po/en_GB.po Sun Mar 18 22:45:01 2007 @@ -563,8 +563,8 @@ #: src/pacman/pacman.c:153 #, c-format -msgid " --noconfirm do not ask for anything confirmation\n" -msgstr " --noconfirm do not ask for anything confirmation\n" +msgid " --noconfirm do not ask for any confirmation\n" +msgstr " --noconfirm do not ask for any confirmation\n" #: src/pacman/pacman.c:154 #, c-format Index: pacman-lib/src/pacman/po/fr.po diff -u pacman-lib/src/pacman/po/fr.po:1.10 pacman-lib/src/pacman/po/fr.po:1.11 --- pacman-lib/src/pacman/po/fr.po:1.10 Wed Mar 14 10:14:37 2007 +++ pacman-lib/src/pacman/po/fr.po Sun Mar 18 22:45:01 2007 @@ -572,7 +572,7 @@ #: src/pacman/pacman.c:153 #, fuzzy, c-format -msgid " --noconfirm do not ask for anything confirmation\n" +msgid " --noconfirm do not ask for any confirmation\n" msgstr " --noconfirm ne demande aucune confirmation\n" #: src/pacman/pacman.c:154 Index: pacman-lib/src/pacman/po/hu.po diff -u pacman-lib/src/pacman/po/hu.po:1.11 pacman-lib/src/pacman/po/hu.po:1.12 --- pacman-lib/src/pacman/po/hu.po:1.11 Sun Mar 11 20:43:53 2007 +++ pacman-lib/src/pacman/po/hu.po Sun Mar 18 22:45:01 2007 @@ -553,7 +553,7 @@ #: src/pacman/pacman.c:153 #, c-format -msgid " --noconfirm do not ask for anything confirmation\n" +msgid " --noconfirm do not ask for any confirmation\n" msgstr " --noconfirm ne kérjen soha megerõsítést\n" #: src/pacman/pacman.c:154 Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.16 pacman-lib/src/pacman/po/it.po:1.17 --- pacman-lib/src/pacman/po/it.po:1.16 Sun Mar 18 21:28:31 2007 +++ pacman-lib/src/pacman/po/it.po Sun Mar 18 22:45:01 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-19 00:46+0100\n" -"PO-Revision-Date: 2007-03-19 01:00+0100\n" +"POT-Creation-Date: 2007-03-19 02:42+0100\n" +"PO-Revision-Date: 2007-03-19 03:30+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -383,7 +383,7 @@ msgid "" " -c, --cascade remove packages and all packages that depend on them\n" msgstr "" -" -c, --cascade rimuove i pacchetti e quelli che dipendono da questi\n" +" -c, --cascade rimuove tutte le dipendenze a cascata\n" #: src/pacman/pacman.c:110 #, c-format @@ -402,7 +402,7 @@ #, c-format msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" -msgstr " -s, --recursive rimuove anche le dipendenze (non richieste)\n" +msgstr " -s, --recursive rimuove anche le dipendenze (non richieste altrove)\n" #: src/pacman/pacman.c:115 #, c-format @@ -515,7 +515,7 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l. --list <repo> view a list of packages in a repo\n" -msgstr " -l, --list <repo> visualizza la lista dei pacchetti di un repo\n" +msgstr " -l, --list <repo> visualizza la lista dei pacchetti di un repository\n" #: src/pacman/pacman.c:146 #, c-format @@ -569,14 +569,14 @@ #: src/pacman/pacman.c:154 #, c-format -msgid " --noconfirm do not ask for anything confirmation\n" +msgid " --noconfirm do not ask for any confirmation\n" msgstr " --noconfirm non chiede alcuna conferma\n" #: src/pacman/pacman.c:155 #, c-format msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" -msgstr " --ask <numero> pre-specifica delle risposte alle domande\n" +msgstr " --ask <numero> specifica in anticipo le risposte alle domande\n" #: src/pacman/pacman.c:156 #, c-format Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.43 pacman-lib/src/pacman/trans.c:1.44 --- pacman-lib/src/pacman/trans.c:1.43 Tue Mar 6 10:00:26 2007 +++ pacman-lib/src/pacman/trans.c Sun Mar 18 22:45:01 2007 @@ -80,9 +80,6 @@ MSG(CL, _("done.\n")); break; case PM_TRANS_EVT_EXTRACT_DONE: - if(config->noprogressbar) { - MSG(CL, _("done.\n")); - } break; case PM_TRANS_EVT_ADD_START: if(config->noprogressbar) {

1 0