November 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] Please make the colourised output exactly like that of "pacman-color"
by Xavion 29 Apr '16

29 Apr '16

Hi All, It's great that "pacman" finally has native colour support in v4.1.0. It's just a shame that it's not as good as that of "pacman-color". Without meaning any offence, it falls way short of the mark IMHO. I'm hoping you can just replicate the colourisation of "pacman-color". For your convenience, I've attached the relevant files you'd need. I'm only requesting this because "pacman-color" no longer exists. -- Regards, Xavion.

10 60

[pacman-dev] [PATCH v2] Extend database upgrade script to handle alpm db version 9
by Allan McRae 20 Aug '14

20 Aug '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: Use awk to do symlink to actual directory replacement As an example of what changes get made: diff -Naur local.tmp/glibc-2.18-4/files local/glibc-2.18-4/files --- local.tmp/glibc-2.18-4/files 2013-09-18 18:45:35.747068765 +1000 +++ local/glibc-2.18-4/files 2013-09-18 18:51:29.633643945 +1000 @@ -4,8 +4,8 @@ etc/locale.gen etc/nscd.conf etc/rpc -lib/ -lib/libc.a +usr/lib/ +usr/lib/libc.a usr/ usr/bin/ usr/bin/catchsegv Note that now usr/lib/ is present twice in the file (may not always be the case) and these entries are out of alphabetical order. Both these are cosmetic to pacman. scripts/pacman-db-upgrade.sh.in | 59 ++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index a1630c5..d6f4169 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -109,18 +109,57 @@ fi # do not let pacman run while we do this touch "$lockfile" -# pacman-3.4 to 3.5 upgrade - merge depends into desc -if [[ $(find "$dbroot"/local -name depends) ]]; then - msg "$(gettext "Pre-3.5 database format detected - upgrading...")" - for i in "$dbroot"/local/*; do - if [[ -f "$i"/depends ]]; then - cat "$i"/depends >> "$i"/desc - rm "$i"/depends - fi - done - msg "$(gettext "Done.")" +if [[ -f "${dbroot}"/local/.alpm_db_version ]]; then + db_version=$(cat "${dbroot}"/local/.alpm_db_version) fi +if [[ -z "$db_version" ]]; then + # pacman-3.4 to 3.5 upgrade - merge depends into desc + if [[ $(find "$dbroot"/local -name depends) ]]; then + msg "$(gettext "Pre-3.5 database format detected - upgrading...")" + for i in "$dbroot"/local/*; do + if [[ -f "$i"/depends ]]; then + cat "$i"/depends >> "$i"/desc + rm "$i"/depends + fi + done + msg "$(gettext "Done.")" + fi + + # pacman 4.1 to 4.2 upgrade - remove directory symlink support + dirlist=() + + unset GREP_OPTIONS + while IFS= read -r dir; do + dirlist+=("/${dir%/}") + done < <(grep -h '/$' "$dbroot"/local/*/files | sort -u) + + mapfile -t dirlist < <(find "${dirlist[@]}" -maxdepth 0 -type l) + + if [[ ${#dirlist[@]} != 0 ]]; then + msg "$(gettext "Pre-4.2 database format detected - upgrading...")" + for dir in "${dirlist[@]}"; do + realdir="$(cd $dir; pwd -P)" + for f in "$dbroot"/local/*/files; do + awk -v "dir=${dir#/}/" -v "realdir=${realdir#/}/" ' + BEGIN { + i = length(dir) + 1 + } + { + if (index($0, dir) == 1) { + printf("%s%s\n", realdir, substr($0, i)) + } else { + print + } + }' $f > $f.tmp + mv $f.tmp $f + done + done + fi +fi + +echo "9" > "$dbroot"/local/.alpm_db_version + # remove the lock file rm -f "$lockfile" -- 1.8.4

2 9

[pacman-dev] Fwd: [arch-projects] [ABS] [PATCHv2] Merge bzr, git, hg and svn into a generic proto
by Allan McRae 24 Jan '14

24 Jan '14

I am proposing we include this PKGBUILD-vcs.proto into pacman (after removing the pointer to the Arch wiki). Comments? Allan -------- Original Message -------- Subject: [arch-projects] [ABS] [PATCHv2] Merge bzr, git, hg and svn into a generic proto Date: Tue, 8 Oct 2013 16:13:25 +0200 From: Maxime Gauduin <alucryd(a)gmail.com> Reply-To: Arch Linux projects development discussion <arch-projects(a)archlinux.org> To: arch-projects(a)archlinux.org Having separate prototypes for each VCS type is no longer relevant since Pacman 4.1. Having a generic prototype for regular, bzr, git hg and svn packages makes more sense. Left cvs, and darcs protos untouched as they are not yet supported in Pacman. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 64 ---------------------------- prototypes/PKGBUILD-git.proto | 64 ---------------------------- prototypes/PKGBUILD-hg.proto | 65 ---------------------------- prototypes/PKGBUILD-svn.proto | 63 ---------------------------- prototypes/PKGBUILD-vcs.proto | 98 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 256 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto create mode 100644 prototypes/PKGBUILD-vcs.proto <snip> diff --git a/prototypes/PKGBUILD-vcs.proto b/prototypes/PKGBUILD-vcs.proto new file mode 100644 index 0000000..805f4ff --- /dev/null +++ b/prototypes/PKGBUILD-vcs.proto @@ -0,0 +1,98 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# CVS and DARCS are not natively supported in pacman yet, please refer to the +# dedicated prototypes instead. +# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines for more +# information on packaging from VCS sources. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +provides=("${pkgname%-VCS}") +conflicts=("${pkgname%-VCS}") +replaces=() +backup=() +options=() +install= +source=('DIR_NAME::VCS+REPO_URL#FRAGMENT') +noextract=() +md5sums=('SKIP') + +################################################################################ + +# DIR_NAME: Use to change the source directory name if needed + +# VCS: Use to specify the VCS type, not needed when REPO_URL is explicit (for +# example git://URL, svn://URL or lp:NAME) + +# FRAGMENT: Use to pull a specific branch, commit/revision or tag +# Bazaar accepts the 'revision' keyword +# Git accepts the 'branch', 'commit' and 'tag' keywords +# Mercurial accepts the 'branch', 'revision' and 'tag' keywords +# Subversion accepts the 'revision' keyword + +# Examples: +# source=("lp:${pkgname%-bzr}#revision=42") +# source=("git+https://github.com/author/${pkgname%-git}.git#branch=unstable") +# source=('hg+https://bitbucket.org/author/project#tag=2.0') +# source=("${pkgname%-svn}::svn://svn.code.sf.net/p/project/code/trunk"} + +################################################################################ + +pkgver() { + cd "$srcdir/${pkgname%-VCS}" + +# Bazaar + printf "%s" "$(bzr revno)" + +# Git, tags available + printf "%s" "$(git describe --long | sed 's/-/./g')" + +# Git, no tags available + printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + +# Mercurial + printf "%s.%s" "$(hg identify -n)" "$(hg identify -i)" + +# Subversion + printf "%s" "$(svnversion | tr -d 'A-z')" + +# Fallback + printf "%s" "$(date +%Y%m%d)" +} + +prepare() { + cd "$srcdir/${pkgname%-VCS}" + patch -p1 -i "$srcdir/${pkgname%-VCS}.patch" +} + +build() { + cd "$srcdir/${pkgname%-VCS}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/${pkgname%-VCS}" + make -k check +} + +package() { + cd "$srcdir/${pkgname%-VCS}" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- 1.8.4

4 6

[pacman-dev] [PATCH 0/5] Unit tests for -Qk and -Qkk
by Jeremy Heiner 31 Dec '13

31 Dec '13

There are two changes to the test framework to allow these new unit tests: PATCH 2 adds code to run pre and post install scripts for "local" packages, and PATCH 4 adds code to generate mtree data (if the unit test requests it). Thanks again to everyone who provided feedback on my previous attempt at this... hopefully the improvement your suggestions inspired will be obvious. Jeremy Heiner (5): Add the unit tests for -Qk and -Qkk that are possible now. Add unit tests for -Qk and -Qkk with missing files. Simplify the Python code that sets utime of test package files. Add mtree code to test framework and basic unit tests for -Qkk. Add unit tests for -Qkk with altered files. test/pacman/pmdb.py | 3 ++ test/pacman/pmpkg.py | 36 +++++++++++++++++++--- test/pacman/pmtest.py | 5 +--- test/pacman/tests/TESTS | 8 +++++ test/pacman/tests/querycheck001.py | 15 ++++++++++ test/pacman/tests/querycheck002.py | 15 ++++++++++ test/pacman/tests/querycheck003.py | 19 ++++++++++++ test/pacman/tests/querycheck004.py | 17 +++++++++++ test/pacman/tests/querycheck005.py | 16 ++++++++++ test/pacman/tests/querycheck006.py | 20 +++++++++++++ test/pacman/tests/querycheck007.py | 25 ++++++++++++++++ test/pacman/tests/querycheck008.py | 25 ++++++++++++++++ test/pacman/util.py | 61 +++++++++++++++++++++++++++++++++++++- 13 files changed, 256 insertions(+), 9 deletions(-) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py create mode 100644 test/pacman/tests/querycheck003.py create mode 100644 test/pacman/tests/querycheck004.py create mode 100644 test/pacman/tests/querycheck005.py create mode 100644 test/pacman/tests/querycheck006.py create mode 100644 test/pacman/tests/querycheck007.py create mode 100644 test/pacman/tests/querycheck008.py -- 1.8.4.2

3 25

[pacman-dev] [PATCH] deps.c: remove filtered_depend functions
by Andrew Gregory 30 Dec '13

30 Dec '13

filtered_dep was duplicating an alpm_depend_t solely for the purpose of overriding its depmod and would effectively cause alpm_checkdeps to ignore ALPM_TRANS_FLAG_NODEPVERSION if the duplication failed. Manually overriding/restoring the depmod for the original depend removes the duplication as a point of failure and fixes a memory leak where the duplicated depend was not being properly freed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/deps.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e5a0404..6771eac 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -276,24 +276,6 @@ static int no_dep_version(alpm_handle_t *handle) return (handle->trans->flags & ALPM_TRANS_FLAG_NODEPVERSION); } -static alpm_depend_t *filtered_depend(alpm_depend_t *dep, int nodepversion) -{ - if(nodepversion) { - alpm_depend_t *newdep = _alpm_dep_dup(dep); - ASSERT(newdep, return dep); - newdep->mod = ALPM_DEP_MOD_ANY; - dep = newdep; - } - return dep; -} - -static void release_filtered_depend(alpm_depend_t *dep, int nodepversion) -{ - if(nodepversion) { - free(dep); - } -} - /** Find a package satisfying a specified dependency. * The dependency can include versions with depmod operators. * @param pkgs an alpm_list_t* of alpm_pkg_t where the satisfier will be searched @@ -350,7 +332,10 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, for(j = alpm_pkg_get_depends(tp); j; j = j->next) { alpm_depend_t *depend = j->data; - depend = filtered_depend(depend, nodepversion); + alpm_depmod_t orig_mod = depend->mod; + if(nodepversion) { + depend->mod = ALPM_DEP_MOD_ANY; + } /* 1. we check the upgrade list */ /* 2. we check database for untouched satisfying packages */ if(!find_dep_satisfier(upgrade, depend) && @@ -364,7 +349,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, miss = depmiss_new(tp->name, depend, NULL); baddeps = alpm_list_add(baddeps, miss); } - release_filtered_depend(depend, nodepversion); + depend->mod = orig_mod; } } @@ -375,7 +360,10 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_pkg_t *lp = i->data; for(j = alpm_pkg_get_depends(lp); j; j = j->next) { alpm_depend_t *depend = j->data; - depend = filtered_depend(depend, nodepversion); + alpm_depmod_t orig_mod = depend->mod; + if(nodepversion) { + depend->mod = ALPM_DEP_MOD_ANY; + } alpm_pkg_t *causingpkg = find_dep_satisfier(modified, depend); /* we won't break this depend, if it is already broken, we ignore it */ /* 1. check upgrade list for satisfiers */ @@ -391,7 +379,7 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, miss = depmiss_new(lp->name, depend, causingpkg->name); baddeps = alpm_list_add(baddeps, miss); } - release_filtered_depend(depend, nodepversion); + depend->mod = orig_mod; } } } -- 1.8.4.2

2 1

[pacman-dev] [PATCH] cache terminal column width and handle SIGWINCH
by Simon Gomizelj 30 Dec '13

30 Dec '13

Instead of doing ioctl each time, cache the result. Handle SIGWINCH to we know the size of the terminal has changed (handle by clearing the cache). --- Inspired by systemd. This is to set things up for paging, as paging would require caching this value. Once the pager is up, there's no way to poll for columns. src/pacman/pacman.c | 10 ++++++++++ src/pacman/util.c | 20 ++++++++++++++++---- src/pacman/util.h | 1 + 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index df73bcf..1643a63 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1044,6 +1044,16 @@ int main(int argc, char *argv[]) } } + new_action.sa_handler = columns_reset; + sigemptyset(&new_action.sa_mask); + new_action.sa_flags = 0; + + sigaction(SIGWINCH, NULL, &old_action); + if(old_action.sa_handler != SIG_IGN) { + sigaction(SIGWINCH, &new_action, NULL); + } + + /* i18n init */ #if defined(ENABLE_NLS) localize(); diff --git a/src/pacman/util.c b/src/pacman/util.c index 23eea98..fec14b7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -46,6 +46,7 @@ #include "conf.h" #include "callback.h" +static volatile unsigned cached_columns = 0; struct table_cell_t { char *label; @@ -155,12 +156,21 @@ static int flush_term_input(int fd) return 0; } +/* intended to be used as a SIGWINCH handler */ +void columns_reset(int signum) +{ + cached_columns = 0; +} + /* gets the current screen column width */ unsigned short getcols(int fd) { const unsigned short default_tty = 80; const unsigned short default_notty = 0; - unsigned short termwidth = 0; + unsigned short columns = 0; + + if (cached_columns > 0) + return cached_columns; if(!isatty(fd)) { return default_notty; @@ -169,15 +179,17 @@ unsigned short getcols(int fd) #if defined(TIOCGSIZE) struct ttysize win; if(ioctl(fd, TIOCGSIZE, &win) == 0) { - termwidth = win.ts_cols; + columns = win.ts_cols; } #elif defined(TIOCGWINSZ) struct winsize win; if(ioctl(fd, TIOCGWINSZ, &win) == 0) { - termwidth = win.ws_col; + columns = win.ws_col; } #endif - return termwidth == 0 ? default_tty : termwidth; + + cached_columns = columns == 0 ? default_tty : columns; + return cached_columns; } /* does the same thing as 'rm -rf' */ diff --git a/src/pacman/util.h b/src/pacman/util.h index e2297f8..d7f7b3c 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -49,6 +49,7 @@ int trans_init(alpm_transflag_t flags, int check_valid); int trans_release(void); int needs_root(void); int check_syncdbs(size_t need_repos, int check_valid); +void columns_reset(int signum); unsigned short getcols(int fd); int rmrf(const char *path); void indentprint(const char *str, unsigned short indent, unsigned short cols); -- 1.8.4.2

2 3

[pacman-dev] Bug in libalpm: sizeof(off_t)
by Jeremy Heiner 11 Dec '13

11 Dec '13

An app developer can sometimes choose how big they want off_t to be (by #defining _FILE_OFFSET_BITS). The default for i686 is 32 bits (a bit odd, that). Pacman's configure attempts to choose 64 bits, and succeeds in doing so for the Arch builds (but doesn't force that choice). Bad things happen when the app developer chooses differently than configure did, but not until runtime. For example, the app's .o files will think sizeof(alpm_file_t) == 12, whereas libalpm thinks it == 16. The compile and link phases don't catch this. One possible solution might be to "mv alpm.h alpm.h.in", and add something like: #if sizeof(off_t) != @???@ #error ??? #endif Not sure yet what to put in those "???" spots, but the basic idea is to prevent the compiler from generating any .o files that disagree with the ABI of /usr/lib/libalpm. Hope that all made sense, and that I'm not duplicating - I searched the mailing list and the bug database and found zero hits. Anyone see a better solution? Jeremy

4 22

[pacman-dev] [PATCH] alpm_sync_sysupgrade: skip packages being removed
by Andrew Gregory 11 Dec '13

11 Dec '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- pacman can't run into this (yet), but other front-ends might. lib/libalpm/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 551f926..af82dc5 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -209,6 +209,11 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { alpm_pkg_t *lpkg = i->data; + if(alpm_pkg_find(trans->remove, lpkg->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "%s is marked for removal -- skipping\n", lpkg->name); + continue; + } + if(alpm_pkg_find(trans->add, lpkg->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); continue; -- 1.8.4.2

2 1

[pacman-dev] [PATCH] Added mirror support to makepkg's source array.
by Florian Pritz 25 Nov '13

25 Nov '13

From: Ido Rosen <code(a)idorosen.com> To specify multiple mirrors, simply add multiple files to the source array that have the same downloaded filename, e.g.: source=("file.tar.gz::http://mirror1.example.com/file.tar.gz" "file.tar.gz::http://mirror2.example.com/file.tar.gz") ...makepkg will try them all, and if all fail, will abort. This also applies to VCS repositories and local files references in the source array, so for example: source=("git+https://github.com/torvalds/linux.git "git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git") ...will allow cloning the git repository from GitHub if kernel.org is down or fails. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- I've swichted from get_filepath for the array index to get_filename as get_filepath only returns something useful if the local file already exists. I guess this was just an oversight, but noted for reference. I've also tested this a little for http urls and it seems to work as expected. One thing that we might want to fix is that the downloads get validated multiple times right now (once for each entry). scripts/makepkg.sh.in | 73 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..452df09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -326,7 +326,7 @@ download_local() { else local filename=$(get_filename "$netfile") error "$(gettext "%s was not found in the build directory and is not a URL.")" "$filename" - exit 1 # $E_MISSING_FILE + return 1 # $E_MISSING_FILE fi } @@ -375,8 +375,7 @@ download_file() { if (( ret )); then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" error "$(gettext "Failure while downloading %s")" "$filename" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi # rename the temporary download file to the final destination @@ -460,8 +459,7 @@ download_bzr() { msg2 "$(gettext "Branching %s ...")" "${displaylocation}" if ! bzr branch "$url" "$dir" --no-tree --use-existing-dir; then error "$(gettext "Failure while branching %s")" "${displaylocation}" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo @@ -470,15 +468,13 @@ download_bzr() { if [[ -n $distant_url ]]; then if [[ $distant_url != "$local_url" ]]; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi else if [[ $url != "$local_url" ]] ; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" error "$(gettext "The local URL is %s")" "$local_url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" @@ -545,16 +541,14 @@ download_git() { msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" if ! git clone --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then cd_safe "$dir" # Make sure we are fetching the right repo if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then error "$(gettext "%s is not a clone of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git fetch --all -p; then @@ -634,8 +628,7 @@ download_hg() { msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "hg" if ! hg clone -U "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "hg" @@ -673,15 +666,13 @@ extract_hg() { ;; *) error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 + return 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 + return 1 fi popd &>/dev/null @@ -711,8 +702,7 @@ download_svn() { mkdir -p "$dir/.makepkg" if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" @@ -776,34 +766,61 @@ download_sources() { GET_VCS=0 fi + declare -A downloaded # local since no -g supplied to declare. + declare -A expected # local since no -g supplied to declare. local netfile for netfile in "${source[@]}"; do pushd "$SRCDEST" &>/dev/null + local filename=$(get_filename "${netfile}") + expected["${filename}"]=1 + if [[ ${downloaded["${filename}"]} ]]; then + msg "$(gettext "Skipping mirror: %s")" "$netfile" + continue # file already downloaded, current mirror is redundant. + fi local proto=$(get_protocol "$netfile") case "$proto" in local) - download_local "$netfile" + download_local "$netfile" && \ + downloaded["${filename}"]=1 ;; bzr*) - (( GET_VCS )) && download_bzr "$netfile" + (( GET_VCS )) && download_bzr "$netfile" && \ + downloaded["${filename}"]=1 ;; git*) - (( GET_VCS )) && download_git "$netfile" + (( GET_VCS )) && download_git "$netfile" && \ + downloaded["${filename}"]=1 ;; hg*) - (( GET_VCS )) && download_hg "$netfile" + (( GET_VCS )) && download_hg "$netfile" && \ + downloaded["${filename}"]=1 ;; svn*) - (( GET_VCS )) && download_svn "$netfile" + (( GET_VCS )) && download_svn "$netfile" && \ + downloaded["${filename}"]=1 ;; *) - download_file "$netfile" + download_file "$netfile" && \ + downloaded["${filename}"]=1 ;; esac - popd &>/dev/null done + + local failed=() + for expectedfilename in "${!expected[@]}"; do + if [[ ${downloaded["${expectedfilename}"]} ]]; then + continue + else + failed=(${failed[@]} "${expectedfilename}") + error "$(gettext "Fatal failure while downloading file %s")" "${expectedfilename}" + fi + done + if [[ ${#failed[@]} -gt 0 ]]; then + plain "$(gettext "Aborting...")" + exit 1 + fi } # Automatically update pkgver variable if a pkgver() function is provided -- 1.8.4.2

8 15

[pacman-dev] [PATCH] alpm: Add events for creation of pacnew/pacorig files
by Olivier Brunel 21 Nov '13

21 Nov '13

Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- Hey, Some background regarding this: I've written a little tool (kalu, [1]) which is an upgrade notifier, and also features a GUI/frontend for the sysupgrade (-Syu) operation. Whenever there was a pacnew installed, I would open a terminal and run vimdiff on the files; I would also wonder if it wouldn't be nice to have a third file featured, the "original" one (i.e. from the previous package). And so I started wondering about kalu making a list of all pacnew files created during the upgrade, as well as the name & version of the old package, so that I could use a little script to extract the file and start the 3-way diff. (kalu allows to execute one or more command lines after the sysupgrade completed, so this list is just a variable parsed on said cmdlines.) This all works well, but to make that list, kalu would have to e.g. use a regex to extract the pacnew filenames from ALPM's warnings, and that's just not a very good or reliable thing, especially when you know such warnings are translated. Hence, why adding a couple events (there's pacorig as well) in ALPM makes everything much better & simpler; And knowing about such events could be useful to some frontends, even though pacman obviously has no use for it (atm). So, I'm hoping you'd be willing to merge this. Thanks, -j [1] http://jjacky.com/kalu lib/libalpm/add.c | 3 +++ lib/libalpm/alpm.h | 10 +++++++++- src/pacman/callback.c | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ac4e36a..e5eca97 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -363,10 +363,12 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(try_rename(handle, checkfile, newpath)) { errors++; } else { + alpm_pkg_t *arr[2] = { oldpkg, newpkg }; _alpm_log(handle, ALPM_LOG_WARNING, _("%s installed as %s\n"), filename, newpath); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: %s installed as %s\n", filename, newpath); + EVENT(handle, ALPM_EVENT_PACNEW, arr, newpath); } free(newpath); @@ -395,6 +397,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, _("%s saved as %s\n"), filename, newpath); alpm_logaction(handle, ALPM_CALLER_PREFIX, "warning: %s saved as %s\n", filename, newpath); + EVENT(handle, ALPM_EVENT_PACORIG, newpkg, newpath); } } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2c8c1e6..c4f772d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -387,7 +387,15 @@ typedef enum _alpm_event_t { /** Downloading missing keys into keyring. */ ALPM_EVENT_KEY_DOWNLOAD_START, /** Key downloading is finished. */ - ALPM_EVENT_KEY_DOWNLOAD_DONE + ALPM_EVENT_KEY_DOWNLOAD_DONE, + /** A .pacnew file was installed + * An array of packages (current/old one, and installed/new one) and the + * name of the pacnew file are passed to the callback */ + ALPM_EVENT_PACNEW, + /** A .pacorig file was created + * The installed/new package and the name of the pacorig file are passed to + * the callback */ + ALPM_EVENT_PACORIG } alpm_event_t; /** Event callback */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 36531a2..0fc35f6 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -297,6 +297,9 @@ void cb_event(alpm_event_t event, void *data1, void *data2) case ALPM_EVENT_DELTA_INTEGRITY_DONE: case ALPM_EVENT_DELTA_PATCHES_DONE: case ALPM_EVENT_DISKSPACE_DONE: + /* events of creation of .pacnew/.pacorig files */ + case ALPM_EVENT_PACNEW: + case ALPM_EVENT_PACORIG: /* nothing */ break; } -- 1.8.4.2

3 5