- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-589-g8e2648b
by allan＠archlinux.org 24 Feb '13

24 Feb '13

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 8e2648bf02b44a7dc82429327c08cbfd2426ac30 (commit) via 3d142fe8ef70517cb44146d1892709cad3eb9b4f (commit) via 63baba13ecc003a0e083980dc7d036c66518d232 (commit) via 972528c021606934da85aef1d9223dea1d40e2c6 (commit) via 34749e177db5d4aafdb9f3de630c7ab193a0f36d (commit) via 19754b34a36203266c4e02f29178084c77282efd (commit) via 083ac51816323d69fcf2e271ccd52add3cdd6d22 (commit) via 9995510dc81ab75fbb7ad7ca4fffedf8a5318bef (commit) via 4a1d93b92c76bde58193083812dda94c0fa5d373 (commit) via 0bbc406ee8773ed646393cee175280c33fea8dff (commit) from 8803ae3b4d5d90249243b664b02695f7b106b02f (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 8e2648bf02b44a7dc82429327c08cbfd2426ac30 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Feb 19 20:34:33 2013 -0500 add SYMEXPORT to alpm_filelist_contains alpm_filelist_contains is listed in alpm.h and should be public but was not exported. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3d142fe8ef70517cb44146d1892709cad3eb9b4f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Feb 17 21:55:00 2013 -0500 dload: don't download sig if package is found in cache Avoids the segfault seen in FS#33911. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 63baba13ecc003a0e083980dc7d036c66518d232 Author: Richard Pougnet <richard(a)pougnet.ca> Date: Fri Feb 15 22:59:57 2013 -0500 Provide full path names in warning messages Fix FS#31556 by printing filename instead of entryname. Thus, removing a lot of confusion from the output. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 972528c021606934da85aef1d9223dea1d40e2c6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Feb 17 12:02:20 2013 -0500 paccache: use xargs to execute mv/rm commands This removes the restriction on the length of the command line, as xargs will work around by running multiple instances of the command for us. As seen: https://bbs.archlinux.org/viewtopic.php?pid=1232959 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 34749e177db5d4aafdb9f3de630c7ab193a0f36d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Feb 12 22:00:53 2013 +1000 Perform limited conflict checking with --force Pacman currently bails when trying to extract a file over a directory when using --force. Instead of ignoring all conflict, perform the check and skip any file-file conflicts. Conflicts between directories and files are still flagged and cause the transation to abort. As a bonus, we now know about files changing packages when using --force, so we can skip removing them fixing upgrade046. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 19754b34a36203266c4e02f29178084c77282efd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Feb 19 19:41:39 2013 -0500 use resolved_path for filelist_contains alpm_filelist_contains was being used to search for resolved paths, but searching in the unresolved paths, causing it to miss matches. We always search unresolved paths and search the resolved paths if available because _alpm_filelist_resolve is not public and requires a context handle, so it can't be called from alpm_filelist_contains. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 083ac51816323d69fcf2e271ccd52add3cdd6d22 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 15 19:22:15 2013 -0500 return resolved paths from filelist_difference We were comparing files based on resolved paths but returning the original file_t structures, which were not necessarily in the same order. The extra file_t information was only being used to determine if the file was a directory which can be accomplished by testing for a trailing slash, so just return the resolved path. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9995510dc81ab75fbb7ad7ca4fffedf8a5318bef Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 15 19:21:35 2013 -0500 return resolved paths from filelist_intersection We were comparing files based on resolved paths but returning the original file_t structures, which were not necessarily in the same order. The additional file_t information was never used, so just return the resolved path. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4a1d93b92c76bde58193083812dda94c0fa5d373 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 15 18:13:51 2013 -0500 add fileconflict tests for cases with symlinks Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0bbc406ee8773ed646393cee175280c33fea8dff Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Feb 15 13:08:32 2013 -0500 use alpm_list_free on filelist intersection alpm_filelist_intersection returns a list of pointers to internal file_t struct's, so only the list itself should be freed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.sh.in | 4 +- doc/pacman.8.txt | 2 + lib/libalpm/add.c | 19 ++++----- lib/libalpm/alpm.h | 2 +- lib/libalpm/conflict.c | 75 +++++++++++++++++++++++------------- lib/libalpm/dload.c | 2 +- lib/libalpm/filelist.c | 27 ++++++++----- lib/libalpm/remove.c | 3 ++ lib/libalpm/sync.c | 2 +- src/pacman/sync.c | 3 ++ test/pacman/tests/fileconflict022.py | 19 +++++++++ test/pacman/tests/fileconflict023.py | 18 +++++++++ test/pacman/tests/fileconflict024.py | 17 ++++++++ test/pacman/tests/fileconflict025.py | 18 +++++++++ test/pacman/tests/upgrade046.py | 2 - 15 files changed, 160 insertions(+), 53 deletions(-) create mode 100644 test/pacman/tests/fileconflict022.py create mode 100644 test/pacman/tests/fileconflict023.py create mode 100644 test/pacman/tests/fileconflict024.py create mode 100644 test/pacman/tests/fileconflict025.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: Add --noextractonly (-E) to also download/verify source files
by Olivier Brunel 23 Feb '13

23 Feb '13

Because --noextract also implies to not download/verify source files, it wasn't possible to simply do just that, without either extracting and/or building. This option allows just that (and is therefore mostly useful with --nobuild). Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> --- doc/makepkg.8.txt | 5 ++ scripts/makepkg.sh.in | 175 ++++++++++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 84 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 498c79b..7404865 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -65,6 +65,11 @@ Options then make a package out of the result. Keep in mind that creating a patch may be a better solution to allow others to use your PKGBUILD. +*-E, \--noextractonly*:: + Same as '\--noextract' option, but still downloads and verify checksums of + source files. This is mostly useful with the '\--nobuild' option, to only + download and verify source files, without doing anything else. + *-f, \--force*:: makepkg will not build a package if a built package already exists in the `PKGDEST` (set in linkman:makepkg.conf[5]) directory, which may diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..e46221a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -68,6 +68,7 @@ INSTALL=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 +NOEXTRACTONLY=0 RMDEPS=0 REPKG=0 LOGGING=0 @@ -2392,42 +2393,43 @@ usage() { printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo printf -- "$(gettext "Options:")\n" - printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" - printf -- "$(gettext " -c, --clean Clean up work files after build")\n" - printf -- "$(gettext " -d, --nodeps Skip all dependency checks")\n" - printf -- "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "src/" - printf -- "$(gettext " -f, --force Overwrite existing package")\n" - printf -- "$(gettext " -g, --geninteg Generate integrity checks for source files")\n" - printf -- "$(gettext " -h, --help Show this help message and exit")\n" - printf -- "$(gettext " -i, --install Install package after successful build")\n" - printf -- "$(gettext " -L, --log Log package build process")\n" - printf -- "$(gettext " -m, --nocolor Disable colorized output messages")\n" - printf -- "$(gettext " -o, --nobuild Download and extract files only")\n" - printf -- "$(gettext " -p <file> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" - printf -- "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")\n" - printf -- "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")\n" - printf -- "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" - printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\n" - printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" - printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" - printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" - printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" - printf -- "$(gettext " --holdver Do not update VCS sources")\n" - printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" - printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" - printf -- "$(gettext " --nosign Do not create a signature for the package")\n" - printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" - printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" - printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" - printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" - printf -- "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")\n" + printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" + printf -- "$(gettext " -c, --clean Clean up work files after build")\n" + printf -- "$(gettext " -d, --nodeps Skip all dependency checks")\n" + printf -- "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "src/" + printf -- "$(gettext " -E, --noextractonly Same as --noextract but still download & verify checksums")\n" + printf -- "$(gettext " -f, --force Overwrite existing package")\n" + printf -- "$(gettext " -g, --geninteg Generate integrity checks for source files")\n" + printf -- "$(gettext " -h, --help Show this help message and exit")\n" + printf -- "$(gettext " -i, --install Install package after successful build")\n" + printf -- "$(gettext " -L, --log Log package build process")\n" + printf -- "$(gettext " -m, --nocolor Disable colorized output messages")\n" + printf -- "$(gettext " -o, --nobuild Download and extract files only")\n" + printf -- "$(gettext " -p <file> Use an alternate build script (instead of '%s')")\n" "$BUILDSCRIPT" + printf -- "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")\n" + printf -- "$(gettext " -R, --repackage Repackage contents of the package without rebuilding")\n" + printf -- "$(gettext " -s, --syncdeps Install missing dependencies with %s")\n" "pacman" + printf -- "$(gettext " -S, --source Generate a source-only tarball without downloaded sources")\n" + printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" + printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" + printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" + printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" + printf -- "$(gettext " --holdver Do not update VCS sources")\n" + printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" + printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" + printf -- "$(gettext " --nosign Do not create a signature for the package")\n" + printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" + printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" + printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" + printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" + printf -- "$(gettext " --skippgpcheck Do not verify source files with PGP signatures")\n" echo printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" echo - printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" - printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" - printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" - printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" + printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\n" + printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --needed Do not reinstall the targets that are already up to date")\n" + printf -- "$(gettext " --noprogressbar Do not show a progress bar when downloading files")\n" echo printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT" echo @@ -2454,12 +2456,12 @@ fi ARGLIST=("$@") # Parse Command Line Options. -OPT_SHORT="AcdefFghiLmop:rRsSV" +OPT_SHORT="AcdeEfFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' - 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' - 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' - 'skipchecksums' 'skipinteg' 'skippgpcheck' 'skippgpcheck' 'sign' - 'source' 'syncdeps' 'version') + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' + 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noextractonly' 'nosign' + 'pkg:' 'repackage' 'rmdeps' 'skipchecksums' 'skipinteg' 'skippgpcheck' + 'skippgpcheck' 'sign' 'source' 'syncdeps' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -2473,46 +2475,47 @@ unset OPT_SHORT OPT_LONG OPTRET while true; do case "$1" in # Pacman Options - --asdeps) ASDEPS=1;; - --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; - --needed) NEEDED=1;; - --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; + --asdeps) ASDEPS=1;; + --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; + --needed) NEEDED=1;; + --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; # Makepkg Options - --allsource) SOURCEONLY=2 ;; - --asroot) ASROOT=1 ;; - -A|--ignorearch) IGNOREARCH=1 ;; - -c|--clean) CLEANUP=1 ;; - --check) RUN_CHECK='y' ;; - --config) shift; MAKEPKG_CONF=$1 ;; - -d|--nodeps) NODEPS=1 ;; - -e|--noextract) NOEXTRACT=1 ;; - -f|--force) FORCE=1 ;; - -F) INFAKEROOT=1 ;; - -g|--geninteg) GENINTEG=1 ;; - --holdver) HOLDVER=1 ;; - -i|--install) INSTALL=1 ;; - --key) shift; GPGKEY=$1 ;; - -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n' ;; - --nocheck) RUN_CHECK='n' ;; - --nosign) SIGNPKG='n' ;; - -o|--nobuild) NOBUILD=1 ;; - -p) shift; BUILDFILE=$1 ;; - --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; - -r|--rmdeps) RMDEPS=1 ;; - -R|--repackage) REPKG=1 ;; - --skipchecksums) SKIPCHECKSUMS=1 ;; - --skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; - --skippgpcheck) SKIPPGPCHECK=1;; - --sign) SIGNPKG='y' ;; - -s|--syncdeps) DEP_BIN=1 ;; - -S|--source) SOURCEONLY=1 ;; - - -h|--help) usage; exit 0 ;; # E_OK - -V|--version) version; exit 0 ;; # E_OK - - --) OPT_IND=0; shift; break 2;; + --allsource) SOURCEONLY=2 ;; + --asroot) ASROOT=1 ;; + -A|--ignorearch) IGNOREARCH=1 ;; + -c|--clean) CLEANUP=1 ;; + --check) RUN_CHECK='y' ;; + --config) shift; MAKEPKG_CONF=$1 ;; + -d|--nodeps) NODEPS=1 ;; + -e|--noextract) NOEXTRACT=1 ;; + -E|--noextractonly) NOEXTRACTONLY=1 ;; + -f|--force) FORCE=1 ;; + -F) INFAKEROOT=1 ;; + -g|--geninteg) GENINTEG=1 ;; + --holdver) HOLDVER=1 ;; + -i|--install) INSTALL=1 ;; + --key) shift; GPGKEY=$1 ;; + -L|--log) LOGGING=1 ;; + -m|--nocolor) USE_COLOR='n' ;; + --nocheck) RUN_CHECK='n' ;; + --nosign) SIGNPKG='n' ;; + -o|--nobuild) NOBUILD=1 ;; + -p) shift; BUILDFILE=$1 ;; + --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; + -r|--rmdeps) RMDEPS=1 ;; + -R|--repackage) REPKG=1 ;; + --skipchecksums) SKIPCHECKSUMS=1 ;; + --skipinteg) SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;; + --skippgpcheck) SKIPPGPCHECK=1;; + --sign) SIGNPKG='y' ;; + -s|--syncdeps) DEP_BIN=1 ;; + -S|--source) SOURCEONLY=1 ;; + + -h|--help) usage; exit 0 ;; # E_OK + -V|--version) version; exit 0 ;; # E_OK + + --) OPT_IND=0; shift; break 2;; esac shift done @@ -2885,9 +2888,7 @@ mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" -if (( NOEXTRACT )); then - warning "$(gettext "Using existing %s tree")" "src/" -elif (( REPKG )); then +if (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ && { [[ ! -d $pkgdirbase ]] || dir_is_empty "$pkgdirbase"; }; then error "$(gettext "The package directory is empty, there is nothing to repackage!")" @@ -2895,11 +2896,17 @@ elif (( REPKG )); then exit 1 fi else - download_sources - check_source_integrity - extract_sources - if (( PREPAREFUNC )); then - run_prepare + if (( ! NOEXTRACT )); then + download_sources + check_source_integrity + fi + if (( NOEXTRACT || NOEXTRACTONLY )); then + warning "$(gettext "Using existing %s tree")" "src/" + else + extract_sources + if (( PREPAREFUNC )); then + run_prepare + fi fi fi -- 1.8.1.4

4 5

[pacman-dev] [PATCH] makepkg: Add special case with -e and -o together
by William Giokas 23 Feb '13

23 Feb '13

Passing -e and -o (noextract and nobuild, respectively) should cause makepkg to not extract and not build. This means that it should still download sources and verify them. Signed-off-by: William Giokas <1007380(a)gmail.com> --- Another version of the patch sent in earlier today. Does not add any new options, just adds a special case when combining options. doc/makepkg.8.txt | 7 +- scripts/makepkg.sh.in | 177 +++++++++++++++++++++++++++----------------------- 2 files changed, 100 insertions(+), 84 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 498c79b..ff7f509 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -63,7 +63,9 @@ Options use whatever source already exists in the $srcdir/ directory. This is handy if you want to go into $srcdir/ and manually patch or tweak code, then make a package out of the result. Keep in mind that creating a - patch may be a better solution to allow others to use your PKGBUILD. + patch may be a better solution to allow others to use your PKGBUILD. If + used with '\--nobuild', 'makepkg' will only download the sources and run + the prepare function but will not extract. *-f, \--force*:: makepkg will not build a package if a built package already exists in @@ -112,7 +114,8 @@ Options *-o, \--nobuild*:: Download and extract files, run the prepare() function, but do not build them. Useful with the '\--noextract' option if you wish to tweak the files - in $srcdir/ before building. + in $srcdir/ before building. When passed to 'makepkg' with '\--noextract', + the sources will be downloaded and checked, but not extracted. *-p* <buildscript>:: Read the package script `buildscript` instead of the `PKGBUILD` default; diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..cfe1e0c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -432,17 +432,19 @@ download_bzr() { fi fi - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" + if (( ! NOEXTRACT )); then + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" - if ! bzr checkout "$dir" --lightweight; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" - plain "$(gettext "Aborting...")" - exit 1 - fi + if ! bzr checkout "$dir" --lightweight; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" + plain "$(gettext "Aborting...")" + exit 1 + fi - popd &>/dev/null + popd &>/dev/null + fi } download_git() { @@ -486,43 +488,45 @@ download_git() { fi fi - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" + if (( ! NOEXTRACT )); then + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" - if ! git clone "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 - fi + if ! git clone "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" + plain "$(gettext "Aborting...")" + exit 1 + fi - cd_safe "${dir##*/}" + cd_safe "${dir##*/}" - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - commit|tag) - ref=${fragment##*=} - ;; - branch) - ref=origin/${fragment##*=} - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + commit|tag) + ref=${fragment##*=} + ;; + branch) + ref=origin/${fragment##*=} + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if [[ -n $ref ]]; then + if ! git checkout -b makepkg $ref; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 - esac - fi - - if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 + fi fi - fi - popd &>/dev/null + popd &>/dev/null + fi } download_hg() { @@ -559,30 +563,32 @@ download_hg() { fi fi - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" + if (( ! NOEXTRACT )); then + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - branch|revision|tag) - ref=('-u' "${fragment##*=}") - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + branch|revision|tag) + ref=('-u' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi - if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 - fi + if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" + plain "$(gettext "Aborting...")" + exit 1 + fi - popd &>/dev/null + popd &>/dev/null + fi } download_svn() { @@ -621,29 +627,31 @@ download_svn() { fi fi - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" + if (( ! NOEXTRACT )); then + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - revision) - ref=('-r' "${fragment##*=}") - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + revision) + ref=('-r' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi - if ! svn export ${ref[@]} "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - fi + if ! svn export ${ref[@]} "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" + plain "$(gettext "Aborting...")" + fi - popd &>/dev/null + popd &>/dev/null + fi } download_sources() { @@ -682,7 +690,7 @@ download_sources() { esac done - if (( PKGVERFUNC && GET_VCS )); then + if (( PKGVERFUNC && GET_VCS && ! NOEXTRACT )); then update_pkgver check_pkgver || exit 1 check_build_status @@ -2885,7 +2893,7 @@ mkdir -p "$srcdir" chmod a-s "$srcdir" cd_safe "$srcdir" -if (( NOEXTRACT )); then +if (( NOEXTRACT && ! NOBUILD )); then warning "$(gettext "Using existing %s tree")" "src/" elif (( REPKG )); then if (( ! PKGFUNC && ! SPLITPKG )) \ @@ -2894,6 +2902,11 @@ elif (( REPKG )); then plain "$(gettext "Aborting...")" exit 1 fi +elif (( NOEXTRACT && NOBUILD )); then + download_sources + check_source_integrity + msg "$(gettext "Sources have been downloaded.")" + exit 0 #E_OK else download_sources check_source_integrity -- 1.8.2.rc0.22.gb3600c3

2 2

[pacman-dev] [PATCH] Use non-ascii identifiers for overloaded optflags
by Dave Reisner 22 Feb '13

22 Feb '13

This prevents "non-sensical" combinations of flags from being misinterpreted, such as: $ pacman -Si --changelog $package --changelog is -c, meaning --clean for -S $ pacman -Q --sysupgrade --sysupgrade is -u, meaning --upgrades for -Q Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- src/pacman/conf.h | 16 ++++++++++++++- src/pacman/pacman.c | 56 ++++++++++++++++++++++++++--------------------------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d85d11f..c1fd499 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -129,7 +129,21 @@ enum { OP_PRINTFORMAT, OP_GPGDIR, OP_DBONLY, - OP_FORCE + OP_FORCE, + OP_CASCADE, + OP_CHANGELOG, + OP_CLEAN, + OP_NODEPS, + OP_DEPS, + OP_NATIVE, + OP_NOSAVE, + OP_FILE, + OP_PRINT, + OP_RECURSIVE, + OP_SEARCH, + OP_UPGRADES, + OP_SYSUPGRADE, + OP_UNNEEDED }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 38b28e1..513243a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -456,21 +456,21 @@ static int parsearg_database(int opt) static int parsearg_query(int opt) { switch(opt) { - case 'c': config->op_q_changelog = 1; break; - case 'd': config->op_q_deps = 1; break; + case OP_CHANGELOG: config->op_q_changelog = 1; break; + case OP_DEPS: config->op_q_deps = 1; break; case 'e': config->op_q_explicit = 1; break; case 'g': (config->group)++; break; case 'i': (config->op_q_info)++; break; case 'k': (config->op_q_check)++; break; case 'l': config->op_q_list = 1; break; case 'm': config->op_q_locality |= PKG_LOCALITY_LOCAL; break; - case 'n': config->op_q_locality |= PKG_LOCALITY_FOREIGN; break; + case OP_NATIVE: config->op_q_locality |= PKG_LOCALITY_FOREIGN; break; case 'o': config->op_q_owns = 1; break; - case 'p': config->op_q_isfile = 1; break; + case OP_FILE: config->op_q_isfile = 1; break; case 'q': config->quiet = 1; break; - case 's': config->op_q_search = 1; break; + case OP_SEARCH: config->op_q_search = 1; break; case 't': config->op_q_unrequired = 1; break; - case 'u': config->op_q_upgrade = 1; break; + case OP_UPGRADES: config->op_q_upgrade = 1; break; default: return 1; } return 0; @@ -480,7 +480,7 @@ static int parsearg_query(int opt) static int parsearg_trans(int opt) { switch(opt) { - case 'd': + case OP_NODEPS: if(config->flags & ALPM_TRANS_FLAG_NODEPVERSION) { config->flags |= ALPM_TRANS_FLAG_NODEPS; } else { @@ -490,7 +490,7 @@ static int parsearg_trans(int opt) case OP_DBONLY: config->flags |= ALPM_TRANS_FLAG_DBONLY; break; case OP_NOPROGRESSBAR: config->noprogressbar = 1; break; case OP_NOSCRIPTLET: config->flags |= ALPM_TRANS_FLAG_NOSCRIPTLET; break; - case 'p': config->print = 1; break; + case OP_PRINT: config->print = 1; break; case OP_PRINTFORMAT: check_optarg(); config->print_format = strdup(optarg); @@ -505,16 +505,16 @@ static int parsearg_remove(int opt) if(parsearg_trans(opt) == 0) return 0; switch(opt) { - case 'c': config->flags |= ALPM_TRANS_FLAG_CASCADE; break; - case 'n': config->flags |= ALPM_TRANS_FLAG_NOSAVE; break; - case 's': + case OP_CASCADE: config->flags |= ALPM_TRANS_FLAG_CASCADE; break; + case OP_NOSAVE: config->flags |= ALPM_TRANS_FLAG_NOSAVE; break; + case OP_RECURSIVE: if(config->flags & ALPM_TRANS_FLAG_RECURSE) { config->flags |= ALPM_TRANS_FLAG_RECURSEALL; } else { config->flags |= ALPM_TRANS_FLAG_RECURSE; } break; - case 'u': config->flags |= ALPM_TRANS_FLAG_UNNEEDED; break; + case OP_UNNEEDED: config->flags |= ALPM_TRANS_FLAG_UNNEEDED; break; default: return 1; } return 0; @@ -546,13 +546,13 @@ static int parsearg_sync(int opt) if(parsearg_upgrade(opt) == 0) return 0; switch(opt) { - case 'c': (config->op_s_clean)++; break; + case OP_CLEAN: (config->op_s_clean)++; break; case 'g': (config->group)++; break; case 'i': (config->op_s_info)++; break; case 'l': config->op_q_list = 1; break; case 'q': config->quiet = 1; break; case 's': config->op_s_search = 1; break; - case 'u': (config->op_s_upgrade)++; break; + case OP_SYSUPGRADE: (config->op_s_upgrade)++; break; case 'w': config->op_s_downloadonly = 1; config->flags |= ALPM_TRANS_FLAG_DOWNLOADONLY; @@ -585,11 +585,11 @@ static int parseargs(int argc, char *argv[]) {"upgrade", no_argument, 0, 'U'}, {"version", no_argument, 0, 'V'}, {"dbpath", required_argument, 0, 'b'}, - {"cascade", no_argument, 0, 'c'}, - {"changelog", no_argument, 0, 'c'}, - {"clean", no_argument, 0, 'c'}, - {"nodeps", no_argument, 0, 'd'}, - {"deps", no_argument, 0, 'd'}, + {"cascade", no_argument, 0, OP_CASCADE}, + {"changelog", no_argument, 0, OP_CHANGELOG}, + {"clean", no_argument, 0, OP_CLEAN}, + {"nodeps", no_argument, 0, OP_NODEPS}, + {"deps", no_argument, 0, OP_DEPS}, {"explicit", no_argument, 0, 'e'}, {"groups", no_argument, 0, 'g'}, {"help", no_argument, 0, 'h'}, @@ -597,19 +597,19 @@ static int parseargs(int argc, char *argv[]) {"check", no_argument, 0, 'k'}, {"list", no_argument, 0, 'l'}, {"foreign", no_argument, 0, 'm'}, - {"native", no_argument, 0, 'n'}, - {"nosave", no_argument, 0, 'n'}, + {"native", no_argument, 0, OP_NATIVE}, + {"nosave", no_argument, 0, OP_NOSAVE}, {"owns", no_argument, 0, 'o'}, - {"file", no_argument, 0, 'p'}, - {"print", no_argument, 0, 'p'}, + {"file", no_argument, 0, OP_FILE}, + {"print", no_argument, 0, OP_PRINT}, {"quiet", no_argument, 0, 'q'}, {"root", required_argument, 0, 'r'}, - {"recursive", no_argument, 0, 's'}, - {"search", no_argument, 0, 's'}, + {"recursive", no_argument, 0, OP_RECURSIVE}, + {"search", no_argument, 0, OP_SEARCH}, {"unrequired", no_argument, 0, 't'}, - {"upgrades", no_argument, 0, 'u'}, - {"sysupgrade", no_argument, 0, 'u'}, - {"unneeded", no_argument, 0, 'u'}, + {"upgrades", no_argument, 0, OP_UPGRADES}, + {"sysupgrade", no_argument, 0, OP_SYSUPGRADE}, + {"unneeded", no_argument, 0, OP_UNNEEDED}, {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, -- 1.8.1.4

4 3

[pacman-dev] [PATCH] add SYMEXPORT to alpm_filelist_contains
by Andrew Gregory 20 Feb '13

20 Feb '13

alpm_filelist_contains is listed in alpm.h and should be public but was not exported. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/filelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 6a24903..697dd23 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -324,7 +324,7 @@ int _alpm_files_cmp(const void *f1, const void *f2) } -char *alpm_filelist_contains(alpm_filelist_t *filelist, +char SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist, const char *path) { alpm_file_t key, *match; -- 1.8.1.3

1 0

[pacman-dev] [PATCH 0/5] Use resolved paths for filelist operations
by Andrew Gregory 20 Feb '13

20 Feb '13

Properly handling symlinks requires using resolved paths. I'm not sure if returning strings instead of file_t structs is the best solution, but it seemed like the least drastic one as we prepare for 4.1 and we weren't using the extra information anyway. Andrew Gregory (5): use alpm_list_free on filelist intersection add fileconflict tests for cases with symlinks return resolved paths from filelist_intersection return resolved paths from filelist_difference use resolved_path for filelist_contains lib/libalpm/alpm.h | 2 +- lib/libalpm/conflict.c | 47 +++++++++++++++++------------------- lib/libalpm/filelist.c | 18 ++++++-------- lib/libalpm/remove.c | 3 +++ test/pacman/tests/fileconflict022.py | 19 +++++++++++++++ test/pacman/tests/fileconflict023.py | 18 ++++++++++++++ test/pacman/tests/fileconflict024.py | 17 +++++++++++++ test/pacman/tests/fileconflict025.py | 18 ++++++++++++++ 8 files changed, 106 insertions(+), 36 deletions(-) create mode 100644 test/pacman/tests/fileconflict022.py create mode 100644 test/pacman/tests/fileconflict023.py create mode 100644 test/pacman/tests/fileconflict024.py create mode 100644 test/pacman/tests/fileconflict025.py -- 1.8.1.3

3 17

[pacman-dev] Option to install opt-depends
by Richard Pougnet 19 Feb '13

19 Feb '13

Hello, I was browsing through flyspray and saw a feature request from 2008, FS#11337. It is for the addition of an option to install optional dependencies or to be prompted during the installation. This seems like fun to implement, so I am considering doing it. So, I am wondering if anyone has started doing this or has comments on it?

2 1

[pacman-dev] [PATCH] dload: don't download sig if package is found in cache
by Dave Reisner 19 Feb '13

19 Feb '13

Avoids the segfault seen in FS#33911. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This is sort of an easy cop-out, but also perhaps the right thing to do? If we blindly append .sig to the URL we have then we're just going to end up back at the problem which commit 27067b137286a4 attempted to solve, but without the aid of being able to know what the followed URL is (since we didn't download anything). lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 280eaaf..7513822 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -688,7 +688,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) } /* attempt to download the signature */ - if(ret == 0 && (handle->siglevel & ALPM_SIG_PACKAGE)) { + if(ret == 0 && final_pkg_url && (handle->siglevel & ALPM_SIG_PACKAGE)) { char *sig_filepath, *sig_final_file = NULL; size_t len; -- 1.8.1.3

3 3

[pacman-dev] [PATCH] Provide full path names in warning messages
by Richard Pougnet 18 Feb '13

18 Feb '13

Fix FS#31556 by printing filename instead of entryname. Thus, removing a lot of confusion from the output. --- lib/libalpm/add.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index a828435..f70e2cb 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -184,8 +184,9 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if a file is in NoExtract then we never extract it */ if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { - _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n", - entryname); + _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract," + " skipping extraction of %s\n", + entryname, filename); alpm_logaction(handle, ALPM_CALLER_PREFIX, "note: %s is in NoExtract, skipping extraction\n", entryname); archive_read_data_skip(archive); @@ -224,21 +225,21 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" - "filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, entrymode & mask); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: directory permissions differ on %s\n" - "filesystem: %o package: %o\n", entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, entrymode & mask); } _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* case 10/11: trying to overwrite dir with file/symlink, don't allow it */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } @@ -247,20 +248,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(S_ISDIR(sbuf.st_mode)) { /* the symlink on FS is to a directory, so we'll use it */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* this is BAD. symlink was not to a directory */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } } else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) { /* case 6: trying to overwrite file with dir */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n", - entryname); + filename); } else if(S_ISREG(entrymode)) { /* case 4,7: */ /* if file is in NoUpgrade, don't touch it */ -- 1.8.1.3

2 1

[pacman-dev] [PATCH] paccache: use xargs to execute mv/rm commands
by Dave Reisner 17 Feb '13

17 Feb '13

This removes the restriction on the length of the command line, as xargs will work around by running multiple instances of the command for us. As seen: https://bbs.archlinux.org/viewtopic.php?pid=1232959 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- contrib/paccache.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 74bac8a..46eb230 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -310,9 +310,9 @@ totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum } # crush. kill. destroy. (( verbose )) && cmdopts+=(-v) if (( delete )); then - runcmd rm "${cmdopts[@]}" "${candidates[@]}" + printf '%s\0' "${candidates[@]}" | runcmd xargs -0 rm "${cmdopts[@]}" elif (( move )); then - runcmd mv "${cmdopts[@]}" "${candidates[@]}" "$movedir" + printf '%s\0' "${candidates[@]}" | runcmd xargs -0 mv "${cmdopts[@]}" -t "$movedir" fi summarize "$pkgcount" "${candidates[@]}" -- 1.8.1.3

1 0