- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 00/11] Support VCS URLs.
by Allan McRae 12 Jul '12

12 Jul '12

At the request of Dave, here are the updated versions of patches sent to the list earlier. Support for the following needs readded: CVS, Mercurial, Darcs and Bazaar Known issue: the pkgver check needs adjusted when using an auto-updating pkgver Allan McRae (11): makepkg: remove VCS package support makepkg: reorder source handling functions makepkg: add function to return download protocol makepkg: generalize download_sources makepkg: skip integrity checking early makepkg: allow using GIT source URLs makepkg: fix checksum generation with VCS sources makepkg: modify get_filename to handle VCS sources makepkg: modify get_filepath to handle VCS sources makepkg: provide mechanism for auto-updating pkgver makepkg: add support for SVN urls doc/PKGBUILD.5.txt | 64 ----- doc/makepkg.8.txt | 10 - scripts/makepkg.sh.in | 682 +++++++++++++++++++++++++++++--------------------- 3 files changed, 394 insertions(+), 362 deletions(-) -- 1.7.11.1

4 22

[pacman-dev] [PATCH] asdeps flag passed from makepkg to pacman
by Daniel Wallace 11 Jul '12

11 Jul '12

From: Daniel Wallace <daniel.wallace12(a)gmail.com> add the asdeps flag for makepkg so that it does pacman -U --asdeps Signed-off-by: Daniel Wallace <daniel.wallace12(a)gmail.com> --- contrib/bash_completion.in | 6 +++--- contrib/zsh_completion.in | 1 + doc/makepkg.8.txt | 4 ++++ scripts/makepkg.sh.in | 10 ++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 1b265e0..99b9559 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -74,9 +74,9 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asroot check clean config force geninteg help holdver ignorearch - install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar - nosign pkg repackage rmdeps sign skipinteg source syncdeps' + opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch + install log nobuild nocheck nocolor noconfirm nodeps noextract + noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps' 'A L R S c d e f g h i m o p r s') _arch_ptr2comp opts fi diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index dc0a544..84ee93c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -483,6 +483,7 @@ _makepkg_longopts=( '--skipinteg[do not perform any verification checks on source files]' '--skippgpcheck[Do not verify source files with PGP signatures]' '--noconfirm[do not ask for confirmation when resolving dependencies]' + '--asdeps[Install packages as non-explicitly installed]' '--noprogressbar[Do not show a progress bar when downloading files]' ) _makepkg(){ diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 27875a3..b96d768 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -179,6 +179,10 @@ Options (Passed to pacman) Prevent pacman from waiting for user input before proceeding with operations. +*\--asdeps*:: + (Passed to pacman) Install packages as non-explicitly installed (used + with -i / --install). + *\--noprogressbar*:: (Passed to pacman) Prevent pacman from displaying a progress bar; useful if you are redirecting makepkg output to file. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index abfabdf..db95d65 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -52,6 +52,7 @@ splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ readonly -a packaging_options other_options splitpkg_overrides # Options +ASDEPS=0 ASROOT=0 CLEANUP=0 DEP_BIN=0 @@ -83,6 +84,7 @@ FORCE_VER="" PACMAN_OPTS= + shopt -s extglob ### SUBROUTINES ### @@ -1523,13 +1525,15 @@ install_package() { msg "$(gettext "Installing %s package group with %s...")" "$pkgbase" "$PACMAN -U" fi + (( ASDEPS )) && pkglist+=('--asdeps') + local fullver pkgarch pkg pkglist for pkg in ${pkgname[@]}; do fullver=$(get_full_version $pkg) pkgarch=$(get_pkg_arch $pkg) pkglist+=("$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}") done - + if ! run_pacman -U ${pkglist[@]}; then warning "$(gettext "Failed to install built package(s).")" return 0 @@ -1986,6 +1990,7 @@ usage() { printf -- "$(gettext "These options can be passed to %s:")\n" "pacman" echo printf -- "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")\n" + printf -- "$(gettext " --asdeps Install packages as non-explicitly installed")\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" @@ -2021,7 +2026,7 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean' 'nodeps' 'version' 'config:') # Pacman Options -OPT_LONG+=('noconfirm' 'noprogressbar') +OPT_LONG+=('asdeps' 'noconfirm' 'noprogressbar') if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then exit 1 # E_INVALID_OPTION; @@ -2032,6 +2037,7 @@ unset OPT_SHORT OPT_LONG OPTRET while true; do case "$1" in # Pacman Options + --asdeps) ASDEPS=1;; --noconfirm) PACMAN_OPTS+=" --noconfirm" ;; --noprogressbar) PACMAN_OPTS+=" --noprogressbar" ;; -- 1.7.11.1

2 1

[pacman-dev] [PATCH] contrib/bacman: fix package architecture in filename
by Allan McRae 11 Jul '12

11 Jul '12

Give the generated package the correct architecture in its filename rather than assuming the system architecture. Also add updated copyright notice. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/bacman.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index ffb9d6d..7895a40 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -4,7 +4,8 @@ # This script rebuilds an already installed package using metadata # stored into the pacman database and system files # -# (c) 2008 - locci <carlocci_at_gmail_dot_com> +# Copyright (c) 2008 locci <carlocci_at_gmail_dot_com> +# Copyright (c) 2008-2012 Pacman Development Team <pacman-dev(a)archlinux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -90,7 +91,6 @@ if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi -pkg_arch=${CARCH:-'unknown'} pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} @@ -186,7 +186,6 @@ fi echo "# $(LC_ALL=C date)" >> .PKGINFO echo "#" >> .PKGINFO -cat "$pkg_dir"/{desc,files} | while read i; do if [[ -z $i ]]; then continue; @@ -216,6 +215,7 @@ while read i; do ;; %ARCH%) echo "arch = $i" >> .PKGINFO + pkg_arch="$i" ;; %BUILDDATE%) echo "builddate = $(date -u "+%s")" >> .PKGINFO @@ -251,7 +251,7 @@ while read i; do echo "backup = ${i%%$'\t'*}" >> .PKGINFO ;; esac -done +done < <(cat "$pkg_dir"/{desc,files}) comp_files=".PKGINFO" -- 1.7.11.1

1 1

[pacman-dev] [PATCH] Add conflict for replacing empty directory owned
by Allan McRae 11 Jul '12

11 Jul '12

When two packages own an empty directory, pacman finds no conflict when one of those packages wants to replace the directory with a file or a symlink. When it comes to actually extracting the new file/symlink, pacman sees the directory is still there (we do not remove empty directories if they are owned by a package) and refuses to extract. Detect this potential conflict early and bail. Note that it is a _potential_ conflict and not a guaranteed one as the other package owning the directory could be updated or removed first which would remove the conflict. However, pacman currently can not sort package installation order to ensure this, so this conflict requires manual upgrade ordering. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This fixes the issues people are experiencing with the /lib/ to /lib -> usr/lib change in Arch Linux. People using -f to resolve the conflict will still end up with non-booting systems, but stupidity has its own rewards (for us as observers). This is probably maint worthy. lib/libalpm/conflict.c | 33 +++++++++++++++++++++++++++++---- test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++ test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++ 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/fileconflict009.py create mode 100644 test/pacman/tests/fileconflict010.py diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 3b8fce0..b52c50a 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -330,15 +330,40 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, return NULL; } -static int dir_belongsto_pkg(const char *root, const char *dirpath, +static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, alpm_pkg_t *pkg) { + alpm_list_t *local, *local_pkgs; + const char *root = handle->root; struct stat sbuf; char path[PATH_MAX]; char abspath[PATH_MAX]; struct dirent *ent = NULL; DIR *dir; + /* TODO: this is an overly strict check but currently pacman will not + * overwrite a directory with a file (case 10/11 in add.c). Adjusting that + * is not simple as even if the directory is being unowned by a conflicting + * package, pacman does not sort this to ensure all required directory + * "removals" happen before installation of file/symlink */ + + /* check no other _installed_ package owns the directory */ + local_pkgs = _alpm_db_get_pkgcache(handle->db_local); + for(local = local_pkgs; local; local = local->next) { + alpm_pkg_t *local_pkg = local->data; + alpm_filelist_t *filelist; + + if(pkg == local_pkg) { + continue; + } + + filelist = alpm_pkg_get_files(local_pkg); + if(_alpm_filelist_contains(filelist, dirpath)) { + return 0; + } + } + + /* check all files in directory are owned by the package */ snprintf(abspath, PATH_MAX, "%s%s", root, dirpath); dir = opendir(abspath); if(dir == NULL) { @@ -351,13 +376,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath, if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { continue; } - snprintf(path, PATH_MAX, "%s/%s", dirpath, name); + snprintf(path, PATH_MAX, "%s%s", dirpath, name); snprintf(abspath, PATH_MAX, "%s%s", root, path); if(stat(abspath, &sbuf) != 0) { continue; } if(S_ISDIR(sbuf.st_mode)) { - if(dir_belongsto_pkg(root, path, pkg)) { + if(dir_belongsto_pkg(handle, path, pkg)) { continue; } else { closedir(dir); @@ -537,7 +562,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "check if all files in %s belongs to %s\n", dir, dbpkg->name); - resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg); + resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg); } free(dir); } diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py new file mode 100644 index 0000000..d277d52 --- /dev/null +++ b/test/pacman/tests/fileconflict009.py @@ -0,0 +1,20 @@ +self.description = "dir->symlink change during package upgrade (directory conflict)" + +lp1 = pmpkg("pkg1") +lp1.files = ["dir/"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.files = ["dir/"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.files = ["dir -> /usr/dir"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("DIR_EXIST=dir/") diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py new file mode 100644 index 0000000..3316a02 --- /dev/null +++ b/test/pacman/tests/fileconflict010.py @@ -0,0 +1,20 @@ +self.description = "dir->file change during package upgrade (directory conflict)" + +lp1 = pmpkg("pkg1") +lp1.files = ["dir/"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.files = ["dir/"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.files = ["dir"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("DIR_EXIST=dir/") -- 1.7.11.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-314-ge41ca0f
by dan＠archlinux.org 10 Jul '12

10 Jul '12

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 e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 (commit) via 392fffe24126c1d0404ead75c1743411fe65310a (commit) via e0daaea38cf7b06bdf9534d793f7fb64cc59cbf6 (commit) via 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (commit) via d7c3164fd5824f1e300d2c7ee92f5c2446461c03 (commit) via ea3439f928a72bd942a810651565cb01e99b5293 (commit) via 44e9fdd0e848382337edb97d41e7317638a67bac (commit) via 717fdb8ee0fd23cf72fc7d2832317f513caefa2c (commit) via d6f31dc78852939f7f83648529887caca2ac9294 (commit) from 0c62b36c19d67939d7a84159c86a5de73fd9d36f (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 e41ca0f2f6e41cc61a10860d3a22c4ca490a34a8 Merge: 392fffe 5c1ba2d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 10 08:41:18 2012 -0500 Merge branch 'maint' Conflicts: etc/makepkg.conf.in commit 392fffe24126c1d0404ead75c1743411fe65310a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 3 23:53:24 2012 -0400 pacman: be more descriptive when opening an include fails if fopen returns NULL, append the libc strerror-ized error message to our own error message. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e0daaea38cf7b06bdf9534d793f7fb64cc59cbf6 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 2 23:42:30 2012 -0400 update comments referring to alpm_option_get_syncdbs This function was renamed alpm_get_syncdbs as part of b488f229d. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ea3439f928a72bd942a810651565cb01e99b5293 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jun 10 21:44:19 2012 -0400 diskspace: log errors when opening the mount table fails Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 1 + doc/Makefile.am | 4 +++ doc/pactree.8.txt | 62 ++++++++++++++++++++++++++++++++++ etc/makepkg.conf.in | 6 ++-- lib/libalpm/be_sync.c | 2 +- lib/libalpm/conflict.c | 37 ++++++++++++++++---- lib/libalpm/db.c | 2 +- lib/libalpm/diskspace.c | 6 ++++ src/pacman/conf.c | 3 +- test/pacman/tests/fileconflict009.py | 20 +++++++++++ test/pacman/tests/fileconflict010.py | 20 +++++++++++ test/pacman/tests/fileconflict012.py | 17 ++++++++++ 12 files changed, 168 insertions(+), 12 deletions(-) create mode 100644 doc/pactree.8.txt create mode 100644 test/pacman/tests/fileconflict009.py create mode 100644 test/pacman/tests/fileconflict010.py create mode 100644 test/pacman/tests/fileconflict012.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.3-22-g5c1ba2d
by dan＠archlinux.org 10 Jul '12

10 Jul '12

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 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (commit) via d7c3164fd5824f1e300d2c7ee92f5c2446461c03 (commit) via 44e9fdd0e848382337edb97d41e7317638a67bac (commit) via 717fdb8ee0fd23cf72fc7d2832317f513caefa2c (commit) via d6f31dc78852939f7f83648529887caca2ac9294 (commit) from 5de465d63efbb82da6127ac927ad29b9c8b1b542 (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 5c1ba2d5fd5263525a0355cdce900b58dc41c916 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 2 10:57:01 2012 -0400 makepkg.conf: add -q option for curl Avoid involving the user's ~/.curlrc file as this may alter the expected behavior of downloads. ref: https://bbs.archlinux.org/viewtopic.php?pid=1124441 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d7c3164fd5824f1e300d2c7ee92f5c2446461c03 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Mar 28 20:22:18 2012 -0400 makepkg.conf: enable curl's cookie engine for http Implements FS#28098. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 44e9fdd0e848382337edb97d41e7317638a67bac Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 8 23:58:37 2012 +1000 Check empty subdirectory ownership When checking if a package owns a directory, it is important to check not only that all the files in the directory are part of the package, but also if the directory is part of a package. This catches empty subdirectories during conflict checking for directory to file/symlink replacements. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 8 21:36:36 2012 +1000 Add conflict for replacing owned empty directory When two packages own an empty directory, pacman finds no conflict when one of those packages wants to replace the directory with a file or a symlink. When it comes to actually extracting the new file/symlink, pacman sees the directory is still there (we do not remove empty directories if they are owned by a package) and refuses to extract. Detect this potential conflict early and bail. Note that it is a _potential_ conflict and not a guaranteed one as the other package owning the directory could be updated or removed first which would remove the conflict. However, pacman currently can not sort package installation order to ensure this, so this conflict requires manual upgrade ordering. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6f31dc78852939f7f83648529887caca2ac9294 Author: Ram Bhamidipaty <rambham(a)gmail.com> Date: Tue Jun 26 22:02:18 2012 -0700 Add man page for pactree Add a man page for the pactree utility. Feedback-from: Allan McRae <allan(a)archlinux.org> Feedback-from: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Ram Bhamidipaty <rambham(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 1 + doc/Makefile.am | 4 +++ doc/pactree.8.txt | 62 ++++++++++++++++++++++++++++++++++ etc/makepkg.conf.in | 6 ++-- lib/libalpm/conflict.c | 37 ++++++++++++++++---- test/pacman/tests/fileconflict009.py | 20 +++++++++++ test/pacman/tests/fileconflict010.py | 20 +++++++++++ test/pacman/tests/fileconflict012.py | 17 ++++++++++ 8 files changed, 158 insertions(+), 9 deletions(-) create mode 100644 doc/pactree.8.txt create mode 100644 test/pacman/tests/fileconflict009.py create mode 100644 test/pacman/tests/fileconflict010.py create mode 100644 test/pacman/tests/fileconflict012.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] signing.c: warn if time went backwards
by Florian Pritz 09 Jul '12

09 Jul '12

GPG signatures have a timestamp which is checked and if it's in the future, verification will fail. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Way simpler than the last version, but I'm not sure if this is the appropriate place or if we should use the status variable to tell the front end about the failure and handle it there. lib/libalpm/signing.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 1e41716..f39e037 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -530,6 +530,10 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path, string_validity(gpgsig->validity), gpgme_strerror(gpgsig->validity_reason)); + if(gpgsig->timestamp > time(NULL)) { + _alpm_log(handle, ALPM_LOG_WARNING, _("System time is behind signature timestamp. Verification will fail.\n")); + } + result = siglist->results + sigcount; err = gpgme_get_key(ctx, gpgsig->fpr, &key, 0); if(gpg_err_code(err) == GPG_ERR_EOF) { -- 1.7.11.1

1 0

[pacman-dev] [PATCH] Check empty subdirectory ownership
by Allan McRae 08 Jul '12

08 Jul '12

When checking if a package owns a directory, it is important to check not only that all the files in the directory are part of the package, but also if the directory is part of a package. This catches empty subdirectories during conflict checking for directory to file/symlink replacements. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Noticed in the /lib -> usr/lib change in Arch Linux. pacman would confirm not files in the /lib directory were unowned by glibc but missed checking empty directories. As these are not removed by pacman, this generated conflicts during extraction. Another maint candidate. lib/libalpm/conflict.c | 5 +++++ test/pacman/tests/fileconflict012.py | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 test/pacman/tests/fileconflict012.py diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b52c50a..bea23df 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -341,6 +341,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, struct dirent *ent = NULL; DIR *dir; + /* check directory is actually in package - used for subdirectory checks */ + if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) { + return 0; + } + /* TODO: this is an overly strict check but currently pacman will not * overwrite a directory with a file (case 10/11 in add.c). Adjusting that * is not simple as even if the directory is being unowned by a conflicting diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py new file mode 100644 index 0000000..261a45e --- /dev/null +++ b/test/pacman/tests/fileconflict012.py @@ -0,0 +1,18 @@ +self.description = "dir->file change during package upgrade (filesystem file conflict)" + +lp1 = pmpkg("pkg1") +lp1.files = ["dir/"] +self.addpkg2db("local", lp1) + +self.filesystem = ["dir/file"] + +p = pmpkg("pkg1", "1.0-2") +p.files = ["dir"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("DIR_EXIST=dir/") -- 1.7.11.1

1 0

[pacman-dev] [PATCH 1/2] libalpm: introduce a disabled status for repos
by Dave Reisner 03 Jul '12

03 Jul '12

Disabled repos are still sync'd on a repo refresh, but will never be searched in when looking for package upgrades. A user can still opt to explicitly install something from this repo by using the repo/pkgname format for a target. This patch introduces get/set methods for the disabled attribute on the alpm_db_t object, alpm_db_{get,set}_disabled(). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Dan mentioned this in IRC, and I rather liked the idea given how many times I've accidentally updated to [staging]. Ends up being fairly non-invasive, and doesn't require any API breakage. lib/libalpm/alpm.h | 13 +++++++++++++ lib/libalpm/db.c | 16 ++++++++++++++++ lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 15 +++++++++++++-- lib/libalpm/sync.c | 15 +++++++++++++-- test/pacman/tests/sync051.py | 17 +++++++++++++++++ test/pacman/tests/sync052.py | 14 ++++++++++++++ 7 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 test/pacman/tests/sync051.py create mode 100644 test/pacman/tests/sync052.py diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index bb792cf..53bf2a3 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -661,6 +661,19 @@ alpm_list_t *alpm_db_get_groupcache(alpm_db_t *db); */ alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); +/** Sets the disabled status of a database. + * @param db pointer to the package database to set the status for + * @param disabled a 0 (enabled) or positive integer (disabled) + * @return 0 on success, or -1 on error + */ +int alpm_db_set_disabled(alpm_db_t *db, int disabled); + +/** Gets the disabled status of a database. + * @param db pointer to the package database to get the status of + * @return 0 when enabled, 1 when disabled, -1 on error + */ +int alpm_db_get_disabled(alpm_db_t *db); + /** @} */ /** @addtogroup alpm_api_packages Package Functions diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 8bbdc90..cc205bf 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -289,6 +289,22 @@ alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t* needles) return _alpm_db_search(db, needles); } +/** Sets the disabled status of a repo */ +int SYMEXPORT alpm_db_set_disabled(alpm_db_t *db, int disabled) +{ + ASSERT(db != NULL, return -1); + ASSERT(disabled >= 0, return -1); + db->disabled = !!disabled; + return 0; +} + +/** Gets the disabled status of a repo */ +int SYMEXPORT alpm_db_get_disabled(alpm_db_t *db) +{ + ASSERT(db != NULL, return -1); + return db->disabled; +} + /** @} */ diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 94659b7..76c9fa0 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -73,6 +73,7 @@ struct __alpm_db_t { /* flags determining validity, local, loaded caches, etc. */ enum _alpm_dbstatus_t status; alpm_siglevel_t siglevel; + int disabled; }; diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 2a06bb0..4b953c2 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -589,7 +589,14 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /* 1. literals */ for(i = dbs; i; i = i->next) { - alpm_pkg_t *pkg = _alpm_db_get_pkgfromcache(i->data, dep->name); + alpm_pkg_t *pkg; + alpm_db_t *db = i->data; + + if(db->disabled) { + continue; + } + + pkg = _alpm_db_get_pkgfromcache(db, dep->name); if(pkg && _alpm_depcmp_literal(pkg, dep) && !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(handle, pkg)) { @@ -611,7 +618,11 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, } /* 2. satisfiers (skip literals here) */ for(i = dbs; i; i = i->next) { - for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) { + alpm_db_t *db = i->data; + if(db->disabled) { + continue; + } + for(j = _alpm_db_get_pkgcache(db); j; j = j->next) { alpm_pkg_t *pkg = j->data; /* with hash != hash, we can even skip the strcmp() as we know they can't * possibly be the same string */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 66f7ed1..fbf55a9 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -60,7 +60,12 @@ alpm_pkg_t SYMEXPORT *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_syn pkg->handle->pm_errno = 0; for(i = dbs_sync; !spkg && i; i = i->next) { - spkg = _alpm_db_get_pkgfromcache(i->data, pkg->name); + alpm_db_t *db = i->data; + if(db->disabled) { + continue; + } + + spkg = _alpm_db_get_pkgfromcache(db, pkg->name); } if(spkg == NULL) { @@ -212,8 +217,14 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) for(j = handle->dbs_sync; j; j = j->next) { alpm_db_t *sdb = j->data; /* Check sdb */ - alpm_pkg_t *spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); + alpm_pkg_t *spkg; int literal_upgrade = 0; + + if(sdb->disabled) { + continue; + } + + spkg = _alpm_db_get_pkgfromcache(sdb, lpkg->name); if(spkg) { literal_upgrade = check_literal(handle, lpkg, spkg, enable_downgrade); if(literal_upgrade) { diff --git a/test/pacman/tests/sync051.py b/test/pacman/tests/sync051.py new file mode 100644 index 0000000..bd99ccc --- /dev/null +++ b/test/pacman/tests/sync051.py @@ -0,0 +1,17 @@ +self.description = "upgrade a package with a disabled repo" + +sp = pmpkg("dummy", "2.0-1") +self.addpkg2db("syncdisabled", sp) + +sp = pmpkg("dummy", "1.0-2") +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy", "1.0-1") +self.addpkg2db("local", lp) + +self.args = "-S %s" % sp.name + +self.db['syncdisabled'].option['Disabled'] = ['true'] + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-2") diff --git a/test/pacman/tests/sync052.py b/test/pacman/tests/sync052.py new file mode 100644 index 0000000..be35fa7 --- /dev/null +++ b/test/pacman/tests/sync052.py @@ -0,0 +1,14 @@ +self.description = "sysupgrade with a disabled repo" + +sp = pmpkg("dummy", "1.0-2") +self.addpkg2db("sync", sp) + +lp = pmpkg("dummy", "1.0-1") +self.addpkg2db("local", lp) + +self.args = "-Syu" + +self.db['sync'].option['Disabled'] = ['true'] + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=dummy|1.0-1") -- 1.7.11.1

4 8

[pacman-dev] [PATCH] pactree: show tree vertical "limbs"
by andrew.gregory.8＠gmail.com 03 Jul '12

03 Jul '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Showing vertical limbs makes the tree easier to follow. Old: New: |--pkg |--pkg |--dep1 |--dep1 |--dep2 | |--dep2 |--dep3 |--dep3 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/pactree.c | 105 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 83 insertions(+), 22 deletions(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index aa02c80..2fafd6d 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -27,11 +27,18 @@ #define LINE_MAX 512 +typedef struct tdepth { + struct tdepth *prev; + struct tdepth *next; + int level; +} tdepth; + /* output */ struct graph_style { const char *provides; const char *tip1; const char *tip2; + const char *limb; int indent; }; @@ -39,6 +46,7 @@ static struct graph_style graph_default = { " provides", "|--", "+--", + "|", 3 }; @@ -46,6 +54,7 @@ static struct graph_style graph_linear = { "", "", "", + "", 0 }; @@ -292,28 +301,36 @@ static void cleanup(void) } /* pkg provides provision */ -static void print_text(const char *pkg, const char *provision, int depth) +static void print_text(const char *pkg, const char *provision, tdepth *depth) { - int indent_sz = (depth + 1) * style->indent; - if(!pkg && !provision) { /* not much we can do */ return; } + /* print limbs */ + while(depth->prev) + depth = depth->prev; + int level = 0; + printf("%s", color->branch1); + while(depth->next){ + printf("%*s%-*s", style->indent * (depth->level - level), "", + style->indent, style->limb); + level = depth->level + 1; + depth = depth->next; + } + printf("%*s", style->indent * (depth->level - level), ""); + + /* print tip */ if(!pkg && provision) { - /* we failed to resolve provision */ - printf("%s%*s%s%s%s [unresolvable]%s\n", color->branch1, indent_sz, - style->tip1, color->leaf1, provision, color->branch1, color->off); + printf("%s%s%s%s [unresolvable]%s\n", style->tip1, color->leaf1, + provision, color->branch1, color->off); } else if(provision && strcmp(pkg, provision) != 0) { - /* pkg provides provision */ - printf("%s%*s%s%s%s%s %s%s%s\n", color->branch2, indent_sz, style->tip2, - color->leaf1, pkg, color->leaf2, style->provides, color->leaf1, provision, + printf("%s%s%s%s%s %s%s%s\n", style->tip2, color->leaf1, pkg, + color->leaf2, style->provides, color->leaf1, provision, color->off); } else { - /* pkg is a normal package */ - printf("%s%*s%s%s%s\n", color->branch1, indent_sz, style->tip1, color->leaf1, - pkg, color->off); + printf("%s%s%s%s\n", style->tip1, color->leaf1, pkg, color->off); } } @@ -331,7 +348,7 @@ static void print_graph(const char *parentname, const char *pkgname, const char } /* parent depends on dep which is satisfied by pkg */ -static void print(const char *parentname, const char *pkgname, const char *depname, int depth) +static void print(const char *parentname, const char *pkgname, const char *depname, tdepth *depth) { if(graphviz) { print_graph(parentname, pkgname, depname); @@ -347,7 +364,12 @@ static void print_start(const char *pkgname, const char *provname) "node [style=filled, color=green];\n" " \"START\" -> \"%s\";\n", pkgname); } else { - print_text(pkgname, provname, 0); + tdepth d = { + NULL, + NULL, + 0 + }; + print_text(pkgname, provname, &d); } } @@ -375,11 +397,11 @@ static alpm_pkg_t *get_pkg_from_dbs(alpm_list_t *dbs, const char *needle) { /** * walk dependencies in reverse, showing packages which require the target */ -static void walk_reverse_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) +static void walk_reverse_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth) { alpm_list_t *required_by, *i; - if(!pkg || ((max_depth >= 0) && (depth == max_depth + 1))) { + if(!pkg || ((max_depth >= 0) && (depth->level > max_depth))) { return; } @@ -397,7 +419,24 @@ static void walk_reverse_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) } } else { print(alpm_pkg_get_name(pkg), pkgname, NULL, depth); - walk_reverse_deps(dblist, get_pkg_from_dbs(dblist, pkgname), depth + 1); + tdepth d = { + depth, + NULL, + depth->level + 1 + }; + depth->next = &d; + /* last dep, cut off the limb here */ + if(!alpm_list_next(i)){ + if(depth->prev){ + depth->prev->next = &d; + d.prev = depth->prev; + depth = &d; + } else { + d.prev = NULL; + } + } + walk_reverse_deps(dblist, get_pkg_from_dbs(dblist, pkgname), &d); + depth->next = NULL; } } @@ -407,11 +446,11 @@ static void walk_reverse_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) /** * walk dependencies, showing dependencies of the target */ -static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) +static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, tdepth *depth) { alpm_list_t *i; - if((max_depth >= 0) && (depth == max_depth + 1)) { + if((max_depth >= 0) && (depth->level > max_depth)) { return; } @@ -432,7 +471,24 @@ static void walk_deps(alpm_list_t *dblist, alpm_pkg_t *pkg, int depth) } } else { print(alpm_pkg_get_name(pkg), provname, depend->name, depth); - walk_deps(dblist, provider, depth + 1); + tdepth d = { + depth, + NULL, + depth->level + 1 + }; + depth->next = &d; + /* last dep, cut off the limb here */ + if(!alpm_list_next(i)){ + if(depth->prev){ + depth->prev->next = &d; + d.prev = depth->prev; + depth = &d; + } else { + d.prev = NULL; + } + } + walk_deps(dblist, provider, &d); + depth->next = NULL; } } else { /* unresolvable package */ @@ -486,10 +542,15 @@ int main(int argc, char *argv[]) print_start(alpm_pkg_get_name(pkg), target_name); + tdepth d = { + NULL, + NULL, + 1 + }; if(reverse) { - walk_reverse_deps(dblist, pkg, 1); + walk_reverse_deps(dblist, pkg, &d); } else { - walk_deps(dblist, pkg, 1); + walk_deps(dblist, pkg, &d); } print_end(); -- 1.7.11.1

2 1