- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] _alpm_db_add_pkgincache rework
by Nagy Gabor 16 Jul '08

16 Jul '08

From 7490b62443a0bd08a06fa3c97976a27de5b85665 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 15 Jul 2008 01:07:22 +0200 Subject: [PATCH] _alpm_db_add_pkgincache rework Commit 8240da6cb3ff95ad480efe3e1876104024398fae broke some alpm hierarchy and introduced a new memleak (trans->packages was never freed in case of add transaction, even if the transaction wasn't committed), so it is reverted now. We follow a different approach to reduce memory usage: _alpm_db_add_pkgincache doesn't duplicate the whole package before adding it to the cache, only the package name and version (INFRQ_BASE). This method needs very small extra memory (compared to the reverted method), and after transaction commit we use less memory than before (since the big 'files' fields are not copied to cache), this is useful in GUIs. Note: The old add_pkgincache was a bit broken, since pkg->origin wasn't filled in correctly. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/cache.c | 22 ++++++++++++++++++++-- lib/libalpm/trans.c | 3 +-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index b140476..032cc97 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -98,17 +98,35 @@ alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) return(db->pkgcache); } +/* "duplicate" pkg with BASE info (to spare some memory) then add it to pkgcache */ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) { + pmpkg_t *newpkg; + ALPM_LOG_FUNC; if(db == NULL || pkg == NULL) { return(-1); } + newpkg = _alpm_pkg_new(); + if(newpkg == NULL) { + return(-1); + } + newpkg->name = strdup(pkg->name); + newpkg->version = strdup(pkg->version); + if(newpkg->name == NULL || newpkg->version == NULL) { + pm_errno = PM_ERR_MEMORY; + _alpm_pkg_free(newpkg); + return(-1); + } + newpkg->origin = PKG_FROM_CACHE; + newpkg->origin_data.db = db; + newpkg->infolevel = INFRQ_BASE; + _alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n", - alpm_pkg_get_name(pkg), db->treename); - db->pkgcache = alpm_list_add_sorted(db->pkgcache, pkg, _alpm_pkg_cmp); + alpm_pkg_get_name(newpkg), db->treename); + db->pkgcache = alpm_list_add_sorted(db->pkgcache, newpkg, _alpm_pkg_cmp); _alpm_db_free_grpcache(db); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 06084ae..d6b165d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -251,8 +251,7 @@ void _alpm_trans_free(pmtrans_t *trans) if(trans->type == PM_TRANS_TYPE_SYNC) { alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_sync_free); - } else if (trans->type == PM_TRANS_TYPE_REMOVE || - trans->type == PM_TRANS_TYPE_REMOVEUPGRADE) { + } else { alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free); } alpm_list_free(trans->packages); -- 1.5.6.2

3 2

[pacman-dev] [PATCH] Fix a wrong FREELIST usage in add.c
by Nagy Gabor 16 Jul '08

16 Jul '08

From 4b272f807e2302f1ee184abd8be63f8d02ab47f9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 15 Jul 2008 12:36:10 +0200 Subject: [PATCH] Fix a wrong FREELIST usage in add.c The dynamic pmconflict_t must be freed with _alpm_conflict_free. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/add.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6cf865a..5bf3fcd 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -137,7 +137,8 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) if(data) { *data = lp; } else { - FREELIST(lp); + alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_conflict_free); + alpm_list_free(lp); } if(inner) { _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list\n")); -- 1.5.6.2

2 1

[pacman-dev] [PATCH] Use "pacman -S dep" in makepkg's dependency resolving
by Nagy Gabor 15 Jul '08

15 Jul '08

From 9ca3c6a3ca270d3fadceb6892a5d1dacb9896759 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 8 Jul 2008 10:57:57 +0200 Subject: [PATCH] Use "pacman -S dep" in makepkg's dependency resolving This method is equivalent with pacman's resolvedeps. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- scripts/makepkg.sh.in | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b810d60..bc1f89f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -321,11 +321,6 @@ handledeps() { [ $# -eq 0 ] && return $R_DEPS_SATISFIED local deplist="$*" - local dep depstrip striplist - for dep in $deplist; do - depstrip="$(echo $dep | sed -e 's|=.*$||' -e 's|>.*$||' -e 's|<.*$||')" - striplist="$striplist $depstrip" - done if [ "$DEP_BIN" = "0" ]; then return $R_DEPS_MISSING @@ -337,9 +332,9 @@ handledeps() { local ret=0 if [ "$ASROOT" = 0 ]; then - sudo pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$? + sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? else - pacman $PACMAN_OPTS -S --asdeps $striplist || ret=$? + pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? fi if [ $ret -ne 0 ]; then -- 1.5.6.1

2 2

[pacman-dev] [PATCH] ABS - Specify repo or package to download on command-line
by Allan McRae 11 Jul '08

11 Jul '08

This patch fixes the ability to specify which repos to be synced as parameters to abs (e.g "abs core extra"). In addition, single or multiple packages can be requested on the command line (e.g. "abs core/pacman extra/abs") as well as any combination of repos and packages. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- abs | 50 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 34 insertions(+), 16 deletions(-) diff --git a/abs b/abs index 8f6fd30..a0ae4c7 100755 --- a/abs +++ b/abs @@ -24,7 +24,7 @@ ABS_VERSION="%%ABS_VERSION%%" CONFDIR="%%CONF_DIR%%" SYNCCMD='rsync' -SYNCARGS='-mrtv --no-motd --delete-after --delete-excluded' +SYNCARGS='-mrtv --no-motd --delete-after' BUG_REPORT_EMAIL=pacman-dev(a)archlinux.org ## @@ -73,15 +73,17 @@ fi ## usage() { echo "Arch Build System $ABS_VERSION -- synchronization utility" - echo "usage: $0 [options] [repository1 [repository2 ...]]" + echo "" + echo "Usage:" + echo "$0 [options] [repository1[/package1] [repository2[/package2] ...]]" echo echo "Options:" echo " -h, --help Display this help message then exit." echo " -V, --version Display version information then exit." echo - echo "abs will synchronize PKGBUILD scripts from the Arch Linux" - echo "repository into $ABSROOT via rsync. If no argument is given, abs" - echo "will synchronize the repositories specified in ${CONFDIR}abs.conf." + echo "abs will synchronize PKGBUILD scripts from the Arch Linux repositories" + echo "into $ABSROOT via rsync. If no argument is given, abs will synchronize" + echo "the repositories specified in ${CONFDIR}abs.conf." echo echo "Report bugs to $BUG_REPORT_EMAIL with [ABS] in the subject" } @@ -92,24 +94,39 @@ version() { echo "Copyright (C) 2002-2008 Judd Vinet <jvinet(a)zeroflux.org>." echo echo "This is free software; see the source for copying conditions." - echo "There is NO WARRANTY, to the extent permitted by law." + echo "There is NO WARRANTY, to the extent permitted by law." } update() { cd "$ABSROOT" - EXCLUDE="--filter=P_/local/ --filter=P_/README" - - # I want to ensure we only exclude the top-level repo directories - for repo in "${REPOS[@]}"; do - if [ "$repo" != "${repo#!}" ]; then - EXCLUDE="${EXCLUDE} --filter=-_/${repo#!}/" - fi - done + if [ "$CLPARAM" = "" ]; then + # using repos specified in abs.conf + for repo in "${REPOS[@]}"; do + if [ "$repo" != "${repo#!}" ]; then + EXCLUDE="${EXCLUDE} --filter=-_/${repo#!}/" + fi + done + + EXCLUDE="${EXCLUDE} --filter=P_/local/ --filter=P_/README" + SYNCARGS="${SYNCARGS} --delete-excluded" + else + # using repos/packages specified on the command line + for param in "${REPOS[@]}"; do + INCLUDE="${INCLUDE} --include=/${param}" + if [ "$param" != "${param/\/}" ]; then + repo=${param%/*} + INCLUDE="${INCLUDE} --include=/${repo}" + EXCLUDE="${EXCLUDE} --exclude=/${repo}/*" + fi + done + INCLUDE=$(echo $INCLUDE | tr " " "\n" | sort -u | tr "\n" " ") + EXCLUDE="${EXCLUDE} --exclude=/*" + fi msg "Starting ABS sync..." - $SYNCCMD $SYNCARGS $EXCLUDE ${SYNCSERVER}::abs/${ARCH}/ $ABSROOT -} + $SYNCCMD $SYNCARGS $INCLUDE $EXCLUDE ${SYNCSERVER}::abs/${ARCH}/ $ABSROOT +} ## # Signal Traps @@ -143,6 +160,7 @@ while true; do done if [ "$#" -gt "0" ]; then + CLPARAM=1 REPOS=("$@") fi -- 1.5.6.2

2 5

[pacman-dev] [PATCH] makepkg : switch from getopt to getopts builtin
by Xavier 11 Jul '08

11 Jul '08

>From f5c5a277e2df14650ae441f32950aa6d4deee50f Mon Sep 17 00:00:00 2001 From: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed, 28 May 2008 21:57:28 +0200 Subject: [PATCH] makepkg : switch from getopt to getopts builtin getopt is an external script for parsing and is less portable than getopts which is a bash builtin. The main problem is that it only supports short opts, so long opts had to be dropped. The benefits are a much better portability and a simpler code for the arguments parsing. TODO: better testing, fix man page. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/makepkg.sh.in | 143 +++++++++++++++++++++--------------------------- 1 files changed, 63 insertions(+), 80 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc44c68..f880091 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -27,7 +27,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, sed +# gettext, grep, gzip, sed # gettext initialization export TEXTDOMAIN='pacman' @@ -1056,31 +1056,31 @@ usage() { printf "$(gettext "Usage: %s [options]")\n" "$0" echo echo "$(gettext "Options:")" - printf "$(gettext " -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT" - echo "$(gettext " -c, --clean Clean up work files after build")" - echo "$(gettext " -C, --cleancache Clean up source files from the cache")" - echo "$(gettext " -d, --nodeps Skip all dependency checks")" - echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" - echo "$(gettext " -f, --force Overwrite existing package")" - echo "$(gettext " -g, --geninteg Generate integrity checks for source files")" - echo "$(gettext " -h, --help This help")" - echo "$(gettext " -i, --install Install package after successful build")" - echo "$(gettext " -L, --log Log package build process")" - echo "$(gettext " -m, --nocolor Disable colorized output messages")" - echo "$(gettext " -o, --nobuild Download and extract files only")" + printf "$(gettext " -A Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT" + echo "$(gettext " -c Clean up work files after build")" + echo "$(gettext " -C Clean up source files from the cache")" + echo "$(gettext " -d Skip all dependency checks")" + echo "$(gettext " -e Do not extract source files (use existing src/ dir)")" + echo "$(gettext " -f Overwrite existing package")" + echo "$(gettext " -g Generate integrity checks for source files")" + echo "$(gettext " -h This help")" + echo "$(gettext " -i Install package after successful build")" + echo "$(gettext " -L Log package build process")" + echo "$(gettext " -m Disable colorized output messages")" + echo "$(gettext " -o Download and extract files only")" printf "$(gettext " -p <buildscript> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" - echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" + echo "$(gettext " -r Remove installed dependencies after a successful build")" # fix flyspray feature request #2978 - echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")" - echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" - echo "$(gettext " --asroot Allow makepkg to run as root user")" - echo "$(gettext " --holdver Prevent automatic version bumping for development PKGBUILDs")" - echo "$(gettext " --source Do not build package; generate a source-only tarball")" + echo "$(gettext " -R Repackage contents of pkg/ without building")" + echo "$(gettext " -s Install missing dependencies with pacman")" + echo "$(gettext " -O Allow makepkg to run as root user")" + echo "$(gettext " -H Prevent automatic version bumping for development PKGBUILDs")" + echo "$(gettext " -S Do not build package; generate a source-only tarball")" echo echo "$(gettext "These options can be passed to pacman:")" echo - echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" - echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" + echo "$(gettext " -n Do not ask for confirmation when resolving dependencies")" + echo "$(gettext " -N Do not show a progress bar when downloading files")" echo printf "$(gettext "If -p is not specified, makepkg will look for '%s'")\n" "$BUILDSCRIPT" echo @@ -1130,66 +1130,49 @@ SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined # Parse Command Line Options. -OPT_SHORT="AbcCdefFghiLmop:rRsSV" -OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,forcever:,geninteg,help,holdver" -OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source,syncdeps,usesudo,version" -# Pacman Options -OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" -OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" -if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then - # This is a small hack to stop the script bailing with 'set -e' - echo; usage; exit 1 # E_INVALID_OPTION; -fi -eval set -- "$OPT_TEMP" -unset OPT_SHORT OPT_LONG OPT_TEMP +OPT_SHORT="AcCdefF:ghHiLmnNoOp:rRsSVX" -while true; do - case "$1" in +while getopts "$OPT_SHORT" name; do + case $name in # Pacman Options - --noconfirm) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; - --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; + n) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; + N) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; # Makepkg Options - --asroot) ASROOT=1 ;; - -A|--ignorearch) IGNOREARCH=1 ;; - -c|--clean) CLEANUP=1 ;; - -C|--cleancache) CLEANCACHE=1 ;; - -d|--nodeps) NODEPS=1 ;; - -e|--noextract) NOEXTRACT=1 ;; - -f|--force) FORCE=1 ;; - #hidden opt used by fakeroot call for svn/cvs/etc PKGBUILDs to set pkgver - --forcever) shift; FORCE_VER=$1;; - -F) INFAKEROOT=1 ;; - -g|--geninteg) GENINTEG=1 ;; - --holdver) HOLDVER=1 ;; - -i|--install) INSTALL=1 ;; - -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n' ;; - -o|--nobuild) NOBUILD=1 ;; - -p) shift; BUILDSCRIPT=$1 ;; - -r|--rmdeps) RMDEPS=1 ;; - -R|--repackage) REPKG=1 ;; - --source) SOURCEONLY=1 ;; - -s|--syncdeps) DEP_BIN=1 ;; - - # BEGIN DEPRECATED - -S|--usesudo) - warning "$(gettext "Sudo is used by default now. The --usesudo option is deprecated!")" ;; - # END DEPRECATED - - -h|--help) usage; exit 0 ;; # E_OK - -V|--version) version; exit 0 ;; # E_OK - - --) OPT_IND=0; shift; break;; - *) usage; exit 1 ;; # E_INVALID_OPTION + A) IGNOREARCH=1 ;; + c) CLEANUP=1 ;; + C) CLEANCACHE=1 ;; + d) NODEPS=1 ;; + e) NOEXTRACT=1 ;; + f) FORCE=1 ;; + # hidden opt used by fakeroot call for svn/cvs/etc PKGBUILDs to set pkgver + F) FORCE_VER="$OPTARG";; + g) GENINTEG=1 ;; + H) HOLDVER=1 ;; + i) INSTALL=1 ;; + L) LOGGING=1 ;; + m) USE_COLOR='n' ;; + o) NOBUILD=1 ;; + O) ASROOT=1 ;; + p) BUILDSCRIPT="$OPTARG" ;; + r) RMDEPS=1 ;; + R) REPKG=1 ;; + s) DEP_BIN=1 ;; + S) SOURCEONLY=1 ;; + # hidden opt to indicate fakeroot call + X) INFAKEROOT=1 ;; + + h) usage; exit 0 ;; # E_OK + V) version; exit 0 ;; # E_OK + + ?) usage; exit 1 ;; # E_INVALID_OPTION esac - shift done if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then - # The extra '--' is here to prevent gettext from thinking --holdver is + # The extra '--' is here to prevent gettext from thinking -H is # an option - error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" + error "$(gettext "\\0-H and -F cannot both be specified" )" exit 1 fi @@ -1233,12 +1216,12 @@ if [ "$INFAKEROOT" = "0" ]; then # Warn those who like to live dangerously. error "$(gettext "Running makepkg as root is a BAD idea and can cause")" plain "$(gettext "permanent, catastrophic damage to your system. If you")" - plain "$(gettext "wish to run as root, please use the --asroot option.")" + plain "$(gettext "wish to run as root, please use the -O option.")" exit 1 # $E_USER_ABORT elif [ $EUID -gt 0 -a "$ASROOT" = "1" ]; then - # Warn those who try to use the --asroot option when they are not root - error "$(gettext "The --asroot option is meant for the root user only.")" - plain "$(gettext "Please rerun makepkg without the --asroot flag.")" + # Warn those who try to use the -O option when they are not root + error "$(gettext "The -O option is meant for the root user only.")" + plain "$(gettext "Please rerun makepkg without the -O flag.")" exit 1 # $E_USER_ABORT elif [ "$(check_buildenv fakeroot)" = "y" -a $EUID -gt 0 ]; then if [ ! $(type -p fakeroot) ]; then @@ -1254,7 +1237,7 @@ if [ "$INFAKEROOT" = "0" ]; then fi else if [ "$FAKEROOTKEY" = "" ]; then - error "$(gettext "Do not use the '-F' option. This option is only for use by makepkg.")" + error "$(gettext "Do not use the '-X' option. This option is only for use by makepkg.")" exit 1 # TODO: error code fi fi @@ -1333,7 +1316,7 @@ if [ "$install" -a ! -f "$install" ]; then fi # We need to run devel_update regardless of whether we are in the fakeroot -# build process so that if the user runs makepkg --forcever manually, we +# build process so that if the user runs makepkg -F (forcever) manually, we # 1) output the correct pkgver, and 2) use the correct filename when # checking if the package file already exists - fixes FS #9194 devel_check @@ -1469,9 +1452,9 @@ else msg "$(gettext "Entering fakeroot environment...")" if [ "$newpkgver" != "" ]; then - fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $? + fakeroot -- $0 -F $newpkgver -X $ARGLIST || exit $? else - fakeroot -- $0 -F $ARGLIST || exit $? + fakeroot -- $0 -X $ARGLIST || exit $? fi fi -- 1.5.5.1

6 15

[pacman-dev] pacman -R speed-up (empty cache)
by Nagy Gabor 08 Jul '08

08 Jul '08

Hi! Around this -S reworking, I looked into "-R foo" code, and I noticed that we search for foo group, THEN literal... This forces pacman to read all desc files. Wow. pacman -R group is not a common task... You may say, that I'm cheating, because we will need to check dependencies which loads the localdb. But this task requires depends files only. I temporarily disabled this group removal stuff (pacman.static.new) Let's test (in both case zip is installed): # echo 3 > /proc/sys/vm/drop_caches && time pacman.static.new -R zip real 0m7.697s user 0m0.056s sys 0m0.091s # echo 3 > /proc/sys/vm/drop_caches && time pacman.static.old -R zip real 0m11.822s user 0m0.075s sys 0m0.126s Check what would happen, if -R wouldn't deal with groups at all (my preferred -Rg group way; xyz is not installed): # echo 3 > /proc/sys/vm/drop_caches && time pacman.static.new -R xyz real 0m1.130s user 0m0.009s sys 0m0.011s # echo 3 > /proc/sys/vm/drop_caches && time pacman.static.old -R xyz real 0m7.275s user 0m0.051s sys 0m0.081s

2 4

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.4-22-gd92b0e6
by Dan McGee 08 Jul '08

08 Jul '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via d92b0e674d60e53a43fe9f6d5bc5f311364285c6 (commit) via d534488f2d0b6ca9e90591e74af555fe242dfe39 (commit) from deec3c8d004ec1a5a196bcddd7d1895a6d0c35a3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/hu.po | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.4-232-gb196cc4
by Dan McGee 08 Jul '08

08 Jul '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via b196cc43a50e6fd1dfa9425d7ff8a9302e6fec84 (commit) via d92b0e674d60e53a43fe9f6d5bc5f311364285c6 (commit) via 30702350fa442fd6d450f909cda7124369e68f77 (commit) via 72c0ab5c51d5119b6f81c768b1a0f6ff499df292 (commit) via 8856146d71cb4cc512b0cf3414fbc231635822d3 (commit) via 616b5967b8581d51f9e08dd4178c921eee617d4b (commit) via f7199f36ba5a2b42da51cd227855caaa43c51d58 (commit) via 2122eb1428ac754e9f5d675b4c4fa62b0286d3b6 (commit) via 5f701005ed70fe08bb9932d1a1fe02c59cbc5bb0 (commit) via 11695bd0d7d8efa32066c3adf25007a896661da9 (commit) via d534488f2d0b6ca9e90591e74af555fe242dfe39 (commit) via b15fb504a19831200b86a43646d8def89560b61c (commit) via 74eb2f5c6132b0529dd22b33a14232e7059551c1 (commit) via 7edb2e5b0d55505b49d682f6f4c5b4b1e49c3b72 (commit) from d594b6e7978d14b5ca4cd9c295fa9b829c5565bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b196cc43a50e6fd1dfa9425d7ff8a9302e6fec84 Merge: 30702350fa442fd6d450f909cda7124369e68f77 d92b0e674d60e53a43fe9f6d5bc5f311364285c6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 7 21:39:42 2008 -0500 Merge branch 'maint' commit 30702350fa442fd6d450f909cda7124369e68f77 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Jul 5 10:48:26 2008 +0200 Remove requiredby from pactests Also remove some meaningless pactests (broken requiredby, requiredby*.py tests). requiredby001.py was renamed to upgrade076.py. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72c0ab5c51d5119b6f81c768b1a0f6ff499df292 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Jul 6 01:22:13 2008 +0200 Resolvedeps rework I divided resolvedeps into 2 functions. The new _alpm_resolvedep function will resolve one dependency, for example the 'foo>=1.0-1' dependency. It can be useful in sync_addtarget refactoring. The resolvedeps parameters were changed, to be coherent with recursedeps: * the target-list is an alpm_list* instead of alpm_list**. This is OK, because alpm_list_add == alpm_list_add_last * syncpkg param was removed. list contains the to-be-installed packages, resolvedeps will add the required dependencies into this list * trans param was removed, it was used in QUESTION() only, which can be used on the main (handle->trans) transaction only (because the front-end cannot access our pseudo-transactions at all!). The patch fixes some wrong dynamic pmdepmissing_t usage. I did a behavior change (and sync1003.py was modified accordingly), which needs some explanation: The old resolvedeps didn't elect packages from 'remove' list. I've dropped this because I don't want that 2nd excluding list param. In fact, in real life, we ~never need this rule. Resolvedeps is called before checkconflicts, so only -Su's %REPLACES% packages are sitting in 'remove' list. This means, that we have the replacement packages in our target list. Usually "foo replaces bar" means, that bar isn't in our repos any more, so resolvedeps *cannot* elect it; but usually it won't try it at all, because foo is in the target list, and it is expected to satisfy 'bar>=1.0-1'-like dependencies too. Since checkdeps and checkconflicts is done after resolvedeps, this cannot cause any harm. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8856146d71cb4cc512b0cf3414fbc231635822d3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Jul 6 01:18:11 2008 +0200 Swap parameters on PM_TRANS_CONV_INSTALL_IGNOREPKG callback function PM_TRANS_CONV_INSTALL_IGNOREPKG callback function can get 2 params: foo, bar in this order (packages), bar can be NULL. Old API: foo, NULL: Do you want to install foo from IgnorePkg? foo, bar: foo requires bar from IgnorePkg. Do you want to install bar? New API: foo, bar: Do you want to install foo from IgnorePkg? (If bar!=NULL:) bar requires it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 616b5967b8581d51f9e08dd4178c921eee617d4b Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jul 4 15:39:26 2008 +0200 New _alpm_find_dep_satisfier function This function finds the first satisfier package in a pkglist. Using it instead of _alpm_find_dep_satisfiers eliminates some memleaks and it is faster. (_alpm_find_dep_satisfiers and _alpm_find_pkg_satisfiers will be removed soon.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f7199f36ba5a2b42da51cd227855caaa43c51d58 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 1 22:53:13 2008 +0200 New _alpm_dep_edge function The function is introduced to kill some code duplication. The function name uses the 'dependency graph' terminology. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2122eb1428ac754e9f5d675b4c4fa62b0286d3b6 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 1 21:06:32 2008 +0200 Don't duplicate packages in requiredby list This is a "fix" for FS#10226. I think that multiple versioned dependencies are quite common now, and the old behavior is quite annoying there. This patch won't cause any slow-down. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f701005ed70fe08bb9932d1a1fe02c59cbc5bb0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jul 1 20:23:20 2008 +0200 Use $PKGEXT (from /etc/makepkg.conf) in bacman Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 11695bd0d7d8efa32066c3adf25007a896661da9 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Jun 17 00:09:45 2008 +0200 repo-add cleanup. * change ln -s to ln -sf in the Makefile to prevent a failure when the link already exists. * make test_repo_db_file simpler and more natural, move the complexity out of it. * remove one $cmd = repo-remove check that wasn't needed Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b15fb504a19831200b86a43646d8def89560b61c Author: Carlo Bersani <carlocci(a)gmail.com> Date: Sun Jun 22 21:21:05 2008 -0500 bacman: fix issue with symlink early copy test -e tries to resolve the link before testing, so if the link is copied before the actual file, the script exited. This fixes the issue. [Dan: also add some improved quoting in the script] Signed-off-by: Carlo Bersani <carlocci(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74eb2f5c6132b0529dd22b33a14232e7059551c1 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sun Jun 22 20:11:54 2008 +1000 Additional path quoting and srcdir/pkgdir usage Removes the remaining $startdir/{src,pkg} usage and adds quoting around (hopefully) all remaining path variables Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7edb2e5b0d55505b49d682f6f4c5b4b1e49c3b72 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 19 19:28:56 2008 -0500 Add information on version comparison to manpages Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman | 22 +- doc/PKGBUILD.5.txt | 3 +- doc/pacman.8.txt | 8 +- lib/libalpm/deps.c | 262 ++++++++++----------- lib/libalpm/deps.h | 8 +- lib/libalpm/package.c | 19 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/sync.c | 12 +- pactest/tests/remove040.py | 3 - pactest/tests/remove041.py | 2 - pactest/tests/remove042.py | 2 - pactest/tests/remove043.py | 3 - pactest/tests/remove045.py | 3 - pactest/tests/remove046.py | 10 - pactest/tests/remove047.py | 1 - pactest/tests/remove048.py | 10 - pactest/tests/remove049.py | 1 - pactest/tests/requiredby002.py | 16 -- pactest/tests/requiredby003.py | 16 -- pactest/tests/requiredby004.py | 20 -- pactest/tests/requiredby005.py | 21 -- pactest/tests/requiredby006.py | 21 -- pactest/tests/sync010.py | 2 - pactest/tests/sync060.py | 15 -- pactest/tests/sync1000.py | 2 - pactest/tests/sync1003.py | 17 +- pactest/tests/sync300.py | 1 - pactest/tests/sync400.py | 1 - pactest/tests/sync895.py | 2 - pactest/tests/sync896.py | 2 - pactest/tests/sync900.py | 3 - pactest/tests/sync901.py | 3 - pactest/tests/upgrade052.py | 1 - pactest/tests/upgrade053.py | 1 - pactest/tests/upgrade054.py | 1 - pactest/tests/upgrade055.py | 3 - pactest/tests/upgrade056.py | 4 - pactest/tests/upgrade057.py | 2 - pactest/tests/upgrade058.py | 1 - pactest/tests/upgrade059.py | 2 - pactest/tests/upgrade060.py | 1 - pactest/tests/upgrade061.py | 1 - pactest/tests/upgrade073.py | 2 - pactest/tests/{requiredby001.py => upgrade076.py} | 6 +- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 19 +- scripts/repo-add.sh.in | 28 +- src/pacman/callback.c | 4 +- 48 files changed, 191 insertions(+), 400 deletions(-) delete mode 100644 pactest/tests/remove046.py delete mode 100644 pactest/tests/remove048.py delete mode 100644 pactest/tests/requiredby002.py delete mode 100644 pactest/tests/requiredby003.py delete mode 100644 pactest/tests/requiredby004.py delete mode 100644 pactest/tests/requiredby005.py delete mode 100644 pactest/tests/requiredby006.py delete mode 100644 pactest/tests/sync060.py rename pactest/tests/{requiredby001.py => upgrade076.py} (71%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] sync_addtarget rework
by Nagy Gabor 08 Jul '08

08 Jul '08

From 6541daa508b3f4d050db61f7212fcedf45ab0120 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 5 Jul 2008 12:53:55 +0200 Subject: [PATCH] sync_addtarget rework Now '-S provision' handling is done in the back-end. In case of multiple providers, the first one is selected (behavior change: deleted provision002.py). The old processing order was: literal, group, provision; the new one: literal, provision, group; this is more rational, but "pacman -S group" will be slower now. Now "pacman -S repo/provision" also works. Provision was generalized to dependencies, so "pacman -S 'bash>2.0'" or "pacman -S 'core/bash>2.0'" also works; this can be useful in makepkg dependency resolving. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 19 +++++++++-- lib/libalpm/sync.c | 68 +++++++++++++++-------------------------- pactest/tests/provision002.py | 15 --------- src/pacman/sync.c | 38 ++--------------------- 4 files changed, 43 insertions(+), 97 deletions(-) delete mode 100644 pactest/tests/provision002.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 1a6da96..e042166 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -544,8 +544,14 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud if(pkg && alpm_depcmp(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { int install; - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, tpkg, - pkg, NULL, &install); + /* wow, we have a very stupid callback API here */ + if(tpkg) { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, tpkg, + pkg, NULL, &install); + } else { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + NULL, NULL, &install); + } if(!install) { continue; } @@ -561,8 +567,13 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { int install; - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, tpkg, - pkg, NULL, &install); + if(tpkg) { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, tpkg, + pkg, NULL, &install); + } else { + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, + NULL, NULL, &install); + } if(!install) { continue; } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 9336a2e..74fb7b1 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -272,65 +272,54 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy char *targline; char *targ; alpm_list_t *j; - pmpkg_t *local; - pmpkg_t *spkg = NULL; - pmsyncpkg_t *sync; - int repo_found = 0; + pmpkg_t *local, *spkg; + pmdepend_t *dep; /* provisions and dependencies are also allowed */ ALPM_LOG_FUNC; ASSERT(db_local != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - STRDUP(targline, name, RET_ERR(PM_ERR_MEMORY, -1)); + STRDUP(targline, name, RET_ERR(PM_ERR_MEMORY, -1)); targ = strchr(targline, '/'); if(targ) { /* we are looking for a package in a specific database */ + alpm_list_t *dbs = NULL; *targ = '\0'; targ++; - _alpm_log(PM_LOG_DEBUG, "searching for target '%s' in repo\n", targ); - for(j = dbs_sync; j && !spkg; j = j->next) { + _alpm_log(PM_LOG_DEBUG, "searching for target '%s' in repo '%s'\n", targ, targline); + for(j = dbs_sync; j; j = j->next) { pmdb_t *db = j->data; if(strcmp(db->treename, targline) == 0) { - repo_found = 1; - spkg = _alpm_db_get_pkgfromcache(db, targ); - if(spkg == NULL) { - pm_errno = PM_ERR_PKG_NOT_FOUND; - goto error; - } + dbs = alpm_list_add(NULL, db); + break; } } - if(!repo_found) { + if(dbs == NULL) { _alpm_log(PM_LOG_ERROR, _("repository '%s' not found\n"), targline); - pm_errno = PM_ERR_PKG_REPO_NOT_FOUND; - goto error; + FREE(targline); + RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1); } + dep = _alpm_splitdep(targ); + spkg = _alpm_resolvedep(dep, dbs, NULL, NULL); + _alpm_dep_free(dep); + alpm_list_free(dbs); } else { - targ = targline; - for(j = dbs_sync; j && !spkg; j = j->next) { - pmdb_t *db = j->data; - spkg = _alpm_db_get_pkgfromcache(db, targ); - } - if(spkg == NULL) { - pm_errno = PM_ERR_PKG_NOT_FOUND; - goto error; - } + dep = _alpm_splitdep(targline); + spkg = _alpm_resolvedep(dep, dbs_sync, NULL, NULL); + _alpm_dep_free(dep); } + FREE(targline); + if(spkg == NULL) { + RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + } + if(_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) { - FREE(targline); RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } - if(_alpm_pkg_should_ignore(spkg)) { - int resp; - QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, spkg, NULL, NULL, &resp); - if (!resp) { - return(0); - } - } - local = _alpm_db_get_pkgfromcache(db_local, alpm_pkg_get_name(spkg)); if(local) { if(_alpm_pkg_compare_versions(local, spkg) == 0) { @@ -349,22 +338,15 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy } /* add the package to the transaction */ - sync = _alpm_sync_new(PM_PKG_REASON_EXPLICIT, spkg, NULL); + pmsyncpkg_t *sync = _alpm_sync_new(PM_PKG_REASON_EXPLICIT, spkg, NULL); if(sync == NULL) { - goto error; + return(-1); } _alpm_log(PM_LOG_DEBUG, "adding target '%s' to the transaction set\n", alpm_pkg_get_name(spkg)); trans->packages = alpm_list_add(trans->packages, sync); - FREE(targline); return(0); - -error: - if(targline) { - FREE(targline); - } - return(-1); } /* Helper functions for alpm_list_remove diff --git a/pactest/tests/provision002.py b/pactest/tests/provision002.py deleted file mode 100644 index 32bc4b8..0000000 --- a/pactest/tests/provision002.py +++ /dev/null @@ -1,15 +0,0 @@ -self.description = "-S provision" - -sp = pmpkg("pkg1") -sp.provides = ["provision=1.0-1"] -self.addpkg2db("sync", sp) - -sp = pmpkg("pkg2") -sp.provides = ["provision=1.0-1"] -self.addpkg2db("sync", sp) - -self.args = "-S provision" - -self.addrule("PACMAN_RETCODE=1") -self.addrule("!PKG_EXIST=pkg1") -self.addrule("!PKG_EXIST=pkg2") diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 47ab4eb..6877d85 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -617,41 +617,9 @@ static int sync_trans(alpm_list_t *targets) } } if(!found) { - /* targ not found in sync db, searching for providers... */ - alpm_list_t *prov = NULL; - for(j = sync_dbs; j; j = alpm_list_next(j)) { - pmdb_t *db = alpm_list_getdata(j); - alpm_list_t *dblist = alpm_db_getpkgcache(db); - alpm_list_t *satisfiers = alpm_find_pkg_satisfiers(dblist, targ); - prov = alpm_list_join(prov, satisfiers); - } - if(prov != NULL) { - if(alpm_list_count(prov) == 1) { - const char *pname = NULL; - pmpkg_t *pkg = alpm_list_getdata(prov); - pname = alpm_pkg_get_name(pkg); - alpm_list_free(prov); - printf(_("Warning: %s provides %s\n"), pname, targ); - targets = alpm_list_add(targets, strdup(pname)); - } else { - alpm_list_t *k; - pm_fprintf(stderr, PM_LOG_ERROR, - _("several packages provide %s, please specify one :\n"), targ); - for(k = prov; k; k = alpm_list_next(k)) { - pmpkg_t *pkg = alpm_list_getdata(k); - printf("%s ", alpm_pkg_get_name(pkg)); - } - printf("\n"); - alpm_list_free(prov); - retval = 1; - goto cleanup; - } - } else { - pm_fprintf(stderr, PM_LOG_ERROR, - _("'%s': not found in sync db\n"), targ); - retval = 1; - goto cleanup; - } + pm_fprintf(stderr, PM_LOG_ERROR, _("'%s': not found in sync db\n"), targ); + retval = 1; + goto cleanup; } } } -- 1.5.6.1

3 2

[pacman-dev] [PATCH] Add some verbosity to "-S provision" and "-S group"
by Nagy Gabor 08 Jul '08

08 Jul '08

From f96b366e8b0e2fb3a74e3647e5e07ecd5b78430e Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 5 Jul 2008 14:55:18 +0200 Subject: [PATCH] Add some verbosity to "-S provision" and "-S group" sync_addtarget rework removed the "warning: foo provides bar" message. This was reimplemented (which means, that resolvedeps will also print this message), and "fallback to group" message was also added. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 2 ++ src/pacman/sync.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index b58deea..4b99f5f 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -552,6 +552,8 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud continue; } } + _alpm_log(PM_LOG_WARNING, _("provider package was selected (%s provides %s)\n"), + pkg->name, dep->name); return(pkg); } } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6877d85..1e2af45 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -583,7 +583,7 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } /* target not found: check if it's a group */ - + printf(_("%s package not found, searching for group...\n"), targ); for(j = sync_dbs; j; j = alpm_list_next(j)) { pmdb_t *db = alpm_list_getdata(j); grp = alpm_db_readgrp(db, targ); -- 1.5.6.1

2 1