- Pacman-dev - lists.archlinux.org

[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

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

16 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 8803ae3b4d5d90249243b664b02695f7b106b02f (commit) via bc747fbfbf22bdf5bcf3e2b016afdd21bdea6068 (commit) via d5a5a6b512f20cf0b6f72e58ca0479af69044359 (commit) via 578dfcd9779e5fdcf5b3a32b97c9b31728cc9c20 (commit) via 158a249a7796c27b9f2dec8dfcba51a1d8488fc2 (commit) via c1a84c03b2c8762970af2270160ea3279ff9a525 (commit) via 0a5b79e1339ce07c06b86f2d8cdc474f3532919d (commit) via 540cae816a153d9b79b888c65dcbeff952a36d23 (commit) via 26a79cb29d279c529d58c62b7ad9c103c808d218 (commit) from 8fe8233dfa9c7827371168158784311cffb97556 (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 8803ae3b4d5d90249243b664b02695f7b106b02f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 13 17:06:25 2013 -0500 pmtest: install filesystem entries before packages Installing filesystem entries first allows the filesystem to provide a symlink to a directory. Packages will then be able to use the symlink as if it were a directory instead of causing an error. For example: self.filesystem = ["dir/", "link -> dir/"] pkg = pmpkg("pkg1") pkg.files = ["link/file"] self.addpkg2db("local", pkg) Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bc747fbfbf22bdf5bcf3e2b016afdd21bdea6068 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 13 17:49:02 2013 -0500 fix off-by-one error in _alpm_filelist_resolve '/' should not be appended to the resolved root when root is "/". Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d5a5a6b512f20cf0b6f72e58ca0479af69044359 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 13 18:54:28 2013 -0500 fix style violations Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 578dfcd9779e5fdcf5b3a32b97c9b31728cc9c20 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 13 18:54:29 2013 -0500 fix alpm_validation_t comment Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 158a249a7796c27b9f2dec8dfcba51a1d8488fc2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 13 18:54:30 2013 -0500 add alpm_logaction to API updates Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c1a84c03b2c8762970af2270160ea3279ff9a525 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Feb 13 18:54:33 2013 -0500 find_fileconflicts: reduce path resolution calls Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0a5b79e1339ce07c06b86f2d8cdc474f3532919d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Feb 12 21:18:31 2013 -0500 makepkg: add support for .pkg.tar.lzo Supported by libarchive as of version 3.1.0 when compiled against lzo2 or in the presence of the lzop binary. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 540cae816a153d9b79b888c65dcbeff952a36d23 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Feb 12 21:18:01 2013 -0500 makepkg.conf.5: fix bulletted list item formatting Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 26a79cb29d279c529d58c62b7ad9c103c808d218 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jan 6 19:08:00 2013 -0500 libalpm: never attempt to remove a mountpoint Arch Linux typically runs into this with /sys when upgrading the filesystem package in build chroots, but LXC users might also run into this, since their /sys is shared from the host and must, for security reasons, be mounted RO. I've neglected to add any tests for this because they would require root in order to run. Current tests all pass with this patch and I've confirmed the desired behavior in a VM. Incidentally, the first hunk of this patch (skipping can_remove_file checks for directories) resolves the case of API mountpoints being removed since they eventually fall into unlink_file and fail with "contains files". However, this patch should still be the Right Thing To Do™, as we can't possibly remove a directory that is also a mountpoint. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> [Allan] Do not skip checking if directories can be removed. Instead test if directories are mountpoints in can_remove_file. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 1 + doc/makepkg.conf.5.txt | 9 ++++++--- lib/libalpm/alpm.h | 2 +- lib/libalpm/be_package.c | 5 +++-- lib/libalpm/conflict.c | 10 ++++++---- lib/libalpm/filelist.c | 12 ++++++++---- lib/libalpm/remove.c | 40 ++++++++++++++++++++++++++++++++++++++++ lib/libalpm/signing.c | 3 ++- lib/libalpm/sync.c | 8 ++++---- scripts/makepkg.sh.in | 2 ++ test/pacman/pmtest.py | 6 +++--- 11 files changed, 76 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Perform limited conflict checking with --force
by Allan McRae 16 Feb '13

16 Feb '13

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> --- doc/pacman.8.txt | 2 ++ lib/libalpm/conflict.c | 26 ++++++++++++++++++++++++-- lib/libalpm/sync.c | 2 +- src/pacman/sync.c | 3 +++ test/pacman/tests/upgrade046.py | 2 -- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 358d506..33a9421 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -205,6 +205,8 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] Bypass file conflict checks and overwrite conflicting files. If the package that is about to be installed contains files that are already installed, this option will cause all those files to be overwritten. + Using '--force' will not allow overwriting a directory with a file or + installing packages with conflicting files and directories. This option should be used with care, ideally not at all. *\--asdeps*:: diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 610e5ad..6195c9c 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -439,8 +439,10 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_pkg_t *p2 = j->data; _alpm_filelist_resolve(handle, alpm_pkg_get_files(p2)); - common_files = _alpm_filelist_intersection(alpm_pkg_get_files(p1), - alpm_pkg_get_files(p2)); + alpm_filelist_t *p1_files = alpm_pkg_get_files(p1); + alpm_filelist_t *p2_files = alpm_pkg_get_files(p2); + + common_files = _alpm_filelist_intersection(p1_files, p2_files); if(common_files) { alpm_list_t *k; @@ -448,6 +450,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(k = common_files; k; k = k->next) { alpm_file_t *file = k->data; snprintf(path, PATH_MAX, "%s%s", handle->root, file->name); + + /* can skip file-file conflicts when forced */ + if((handle->trans->flags & ALPM_TRANS_FLAG_FORCE) && + alpm_filelist_contains(p1_files, file->name) && + alpm_filelist_contains(p2_files, file->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "%s exists in both '%s' and '%s'\n", file->name, + p1->name, p2->name); + _alpm_log(handle, ALPM_LOG_DEBUG, + "file-file conflict being forced\n"); + continue; + } conflicts = add_fileconflict(handle, conflicts, path, p1, p2); if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); @@ -601,6 +615,14 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } } + /* skip file-file conflicts when being forced */ + if((handle->trans->flags & ALPM_TRANS_FLAG_FORCE) && + !S_ISDIR(file->mode) && !S_ISDIR(lsbuf.st_mode)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "file-file conflict being force\n"); + resolved_conflict = 1; + } + if(!resolved_conflict) { conflicts = add_fileconflict(handle, conflicts, path, p1, NULL); if(handle->pm_errno == ALPM_ERR_MEMORY) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index be55500..15e6957 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1241,7 +1241,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) trans->state = STATE_COMMITING; /* fileconflict check */ - if(!(trans->flags & (ALPM_TRANS_FLAG_FORCE|ALPM_TRANS_FLAG_DBONLY))) { + if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { EVENT(handle, ALPM_EVENT_FILECONFLICTS_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n"); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 417773d..924cdf5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -881,6 +881,9 @@ int sync_prepare_execute(void) alpm_strerror(err)); switch(err) { case ALPM_ERR_FILE_CONFLICTS: + if(config->flags & ALPM_TRANS_FLAG_FORCE) { + printf(_("unable to %s directory-file conflicts\n"), "--force"); + } for(i = data; i; i = alpm_list_next(i)) { alpm_fileconflict_t *conflict = i->data; switch(conflict->type) { diff --git a/test/pacman/tests/upgrade046.py b/test/pacman/tests/upgrade046.py index a02a713..d9ac66b 100644 --- a/test/pacman/tests/upgrade046.py +++ b/test/pacman/tests/upgrade046.py @@ -29,5 +29,3 @@ self.addrule("FILE_MODIFIED=bin/foobar") self.addrule("FILE_EXIST=usr/share/file") self.addrule("FILE_MODIFIED=usr/share/file") - -self.expectfailure = True -- 1.8.1.3

2 5