September 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pacsysclean: Add new contrib script
by Eric Bélanger 17 Nov '11

17 Nov '11

pacsysclean sort installed packages by decreasing installed size. It's useful for finding large unused package when doing system clean-up. This script is an improved version of other similar scripts posted on the forums. Thanks goes to Dave as I reused the size_to_human function from his paccache script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- If you can think of a better name, feel free to suggest one. --- contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/pacsysclean.in | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 1bd145f..19b81e0 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -6,5 +6,6 @@ paclist paclog-pkglist pacscripts pacsearch +pacsysclean wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 10b03a2..754096d 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,7 +5,8 @@ OURSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ - pacsearch + pacsearch \ + pacsysclean OURFILES = \ bash_completion \ @@ -21,6 +22,7 @@ EXTRA_DIST = \ paclist.in \ pacscripts.in \ pacsearch.in \ + pacsysclean.in \ vimprojects \ zsh_completion.in \ README @@ -59,6 +61,7 @@ paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in +pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in zsh_completion: $(srcdir)/zsh_completion.in diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in new file mode 100755 index 0000000..e393e24 --- /dev/null +++ b/contrib/pacsysclean.in @@ -0,0 +1,87 @@ +#!/bin/bash + +# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# +# Copyright (C) 2011 Eric Bélanger <eric(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 the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' + +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } +fi + +usage() { + echo "$0 - Sort installed packages by decreasing installed size." + echo + echo "Usage: $0 [options]" + echo + echo "Options:" + echo " -a List all packages (Default)" + echo " -e List unrequired explicitely installed packages" + echo " -h, --help Show this help message and exit" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +PACMAN_OPTS="-Qq" +if [ -n "$1" ]; then + case "$1" in + -a) PACMAN_OPTS="-Qq" ;; + -e) PACMAN_OPTS="-Qetq" ;; + -h|--help) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +fi + +TEMPDIR=$(mktemp -d /tmp/cleanup-script.XXXX) +cd $TEMPDIR + +# Sort installed packages by decreasing installed size. Useful for system clean-up. +for package in $(pacman $PACMAN_OPTS); do + echo $(pacman -Qi $package |grep 'Installed Size' |awk '{print $4}') $package +done | sort -g -r -o raw.txt + +N=0 +while read LINE ; do + N=$((N+1)) + size_to_human $(echo -n $LINE |cut -d' ' -f1) >> sorted-list.txt + echo -n ' : ' >> sorted-list.txt + echo -n $LINE |cut -d' ' -f2 >> sorted-list.txt +done < raw.txt + +echo "Files saved to $TEMPDIR" -- 1.7.6

3 10

[pacman-dev] [PATCH 1/6] bacman: get local package db path the correct way
by lolilolicon 06 Oct '11

06 Oct '11

Use globbing and store the expansion results in an array. The [epoch:]pkgver part can start without an integer, e.g. lshw is currently at version B.02.15. extglob is just good enough to match pkgname-[epoch:]pkgver-pkgrel. Set nullglob globally. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/bacman.in | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/bacman.in b/contrib/bacman.in index fe13e5b..b51a4a3 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -23,6 +23,9 @@ readonly progname="bacman" readonly progver="0.2.1" +shopt -s extglob +shopt -s nullglob + # # User Friendliness # @@ -90,8 +93,7 @@ pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" -pkg_dir="$(echo $pac_db/$pkg_name-[0-9]*)" -pkg_namver="${pkg_dir##*/}" +pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([0-9])) # # Checks everything is in place @@ -101,7 +103,11 @@ if [ ! -d "$pac_db" ] ; then exit 1 fi -if [ ! -d "$pkg_dir" ] ; then +if [ ${#pkg_dir[@]} -gt 1 ]; then + echo "ERROR: ${#pkg_dir[@]} entries for package ${pkg_name} found in pacman database" + printf "%s\n" "${pkg_dir[@]}" + exit 1 +elif [ ${#pkg_dir[@]} -eq 0 -o ! -d "$pkg_dir" ]; then echo "ERROR: package ${pkg_name} not found in pacman database" exit 1 fi @@ -109,6 +115,7 @@ fi # # Begin # +pkg_namver="${pkg_dir##*/}" echo Package: ${pkg_namver} work_dir=$(mktemp -d -p /tmp) cd "$work_dir" || exit 1 @@ -275,9 +282,6 @@ esac pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}" ret=0 -# when fileglobbing, we want * in an empty directory to expand to -# the null string rather than itself -shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail bsdtar -cf - $comp_files * | -- 1.7.6.4

3 31

[pacman-dev] Examples in the manpages
by Nico Schottelius 04 Oct '11

04 Oct '11

Dear pacman-devs, after a funny replace pacman-with-pacman-git evening, I digged around a bit into makepkg and pacman and noticed there are no examples in the manpages. Is that intented or would you like to/accept patches which add the EXAMPLES section? Cheers, Nico -- New PGP key: 7ED9 F7D3 6B10 81D7 0EC5 5C09 D7DC C8E4 3187 7DF0 Please resign, if you signed 9885188C or 8D0E27A4. Currently moving *.schottelius.org to http://www.nico.schottelius.org/ ...

13 47

[pacman-dev] [PATCH] makepkg: create tar file for bogus PKGEXT
by lolilolicon 02 Oct '11

02 Oct '11

If PKGEXT is not one of the recognized tar*'s, create_package() would create an empty package file and fail, since bsdtar on the left side of the pipe returns 141 on SIGPIPE (broken pipe). This patch changes the behavior for an invalid PKGEXT. A warning is printed on stderr, and a tar file is created. Also retire the obsolete $EXT variable. Also add the obligatory comment why we don't use bsdtar's compression. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- scripts/makepkg.sh.in | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cc06baa..213ac32 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1256,17 +1256,6 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" - local EXT - case "$PKGEXT" in - *tar.gz) EXT=${PKGEXT%.gz} ;; - *tar.bz2) EXT=${PKGEXT%.bz2} ;; - *tar.xz) EXT=${PKGEXT%.xz} ;; - *tar.Z) EXT=${PKGEXT%.Z} ;; - *tar) EXT=${PKGEXT} ;; - *) warning "$(gettext "'%s' is not a valid archive extension.")" \ - "$PKGEXT" ; EXT=$PKGEXT ;; - esac - local fullver=$(get_full_version) local pkg_file="$PKGDEST/${nameofpkg}-${fullver}-${PKGARCH}${PKGEXT}" local ret=0 @@ -1279,13 +1268,18 @@ create_package() { shopt -s nullglob # TODO: Maybe this can be set globally for robustness shopt -s -o pipefail + # bsdtar's gzip compression always saves the time stamp, making one + # archive created using the same command line distinct from another. + # Disable bsdtar compression and use gzip -n for now. bsdtar -cf - $comp_files * | case "$PKGEXT" in - *tar.gz) gzip -c -f -n ;; - *tar.bz2) bzip2 -c -f ;; - *tar.xz) xz -c -z - ;; - *tar.Z) compress -c -f ;; - *tar) cat ;; + *tar.gz) gzip -c -f -n ;; + *tar.bz2) bzip2 -c -f ;; + *tar.xz) xz -c -z - ;; + *tar.Z) compress -c -f ;; + *tar) cat ;; + *) warning "$(gettext "'%s' is not a valid archive extension." <&-)" \ + "$PKGEXT" <&- >&2; cat ;; esac > "${pkg_file}" || ret=$? shopt -u nullglob -- 1.7.6.4

3 6

[pacman-dev] [PATCH] makepkg: support .tar.Z source packages creation
by lolilolicon 01 Oct '11

01 Oct '11

Also address an uninitialized use of $ret. --- scripts/makepkg.sh.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d426661..8f76656 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1332,6 +1332,7 @@ create_signature() { } create_srcpackage() { + local ret=0 msg "$(gettext "Creating source package...")" local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" mkdir "${srclinks}"/${pkgbase} @@ -1369,6 +1370,7 @@ create_srcpackage() { *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; *tar.xz) TAR_OPT="J" ;; + *tar.Z) TAR_OPT="Z" ;; *tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; @@ -1380,7 +1382,9 @@ create_srcpackage() { # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then + bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase} + ret=$? + if (( ret )); then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 1.7.6.4

2 4

[pacman-dev] [PATCH 0/1] Simple config parser added to scripts library
by lolilolicon 30 Sep '11

30 Sep '11

We're aware of many duplicates in our scripts, among which are things like eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) which is obviously utterly hackish and potentially dangerous, yet (shockingly) quite a common practice in our scripts. Trying to fix all these here and there is a waste of time. As suggested by Dave, I took the liberty to add a config parser to the scripts library. Currently there're only two functions conf_key_val and conf_key_set, which are modified from pacman-key's get_from(). The usage is a bit different, as described in the commit message. If we agree on this change, feel free to port our scripts to use this. lolilolicon (1): scripts/library: add config_parser.sh scripts/library/README | 3 ++ scripts/library/config_parser.sh | 56 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 scripts/library/config_parser.sh -- 1.7.6.4

3 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0rc2-47-g6bb5948
by dan＠archlinux.org 30 Sep '11

30 Sep '11

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 6bb594802588240405efee0813f7aa1daa9648b3 (commit) via e0400fff96497d915e67d190052820d53443d98f (commit) via 938fb2c87859cf495ac72d678d4edb9f6c3217c2 (commit) via 07ecd40a1a1ffba5e5b1c3edd199a0f159496c48 (commit) via 6dfb9d35f8601c3752dc5bd0e8558c48f41a8215 (commit) from 83c05e71bc6e614f6f3d190d5e752a0c5239a2d1 (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 6bb594802588240405efee0813f7aa1daa9648b3 Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Sep 29 10:45:22 2011 +0800 paccache: proper quoting in [[ expression ]] Always quote the right-hand side of expression when the == or != operator is used, unless intended as a pattern. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e0400fff96497d915e67d190052820d53443d98f Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Sep 29 10:45:21 2011 +0800 paccache: declare variables explicitly Declare and initialize integer variables 'needsroot' and 'verbose'. Don't use the fact that (( undefined_variable )) evaluates to 0. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 938fb2c87859cf495ac72d678d4edb9f6c3217c2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Sep 30 06:07:55 2011 -0400 pacman-key: remove errexit flag from shebang We're ill equipped to be using this flag as we don't trap and respond to the ERR signal. The result is that if is ever tripped, pacman-key will instantly exit with no indication of why. At the same time, we're already fairly good about doing our own error checking and verbalizing it before dying. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07ecd40a1a1ffba5e5b1c3edd199a0f159496c48 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Sep 30 13:40:00 2011 +1000 pacman-key: return 0 from get_from if default value used This prevents the error trap being set off when GPGDir is commented in pacman.conf. Bug introduced in 507b01b9. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6dfb9d35f8601c3752dc5bd0e8558c48f41a8215 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 29 21:13:22 2011 +1000 Remove redundant transaction size output Printing all of "Installed", "Removed" and "Net Upgrade" sizes is redundant as the difference of the first two is the last. Instead, only print "Installed Size" and "Net Upgrade Size" when both the installed and removed are non-zero. This results in the following output in the following cases: - package installation only: Installed Size - package removal only: Removed Size - package installation involving replacement: Installed + Net Upgrade Size - package upgrade: Installed + Net Upgrade Size - combination upgrade and installation: Installed + Net Upgrade Size Download Size remains outputted whenever something is downloaded. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 4 ++-- scripts/pacman-key.sh.in | 7 +++++-- src/pacman/util.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Refactor _alpm_runscriptlet()
by Dan McGee 30 Sep '11

30 Sep '11

Add an is_archive parameter to reduce the amount of black magic going on. Rework to use fewer PATH_MAX sized local variables, and simplify some of the logic where appropriate in both this function and in the callers where duplicate calls can be replaced by some conditional parameter code. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/add.c | 48 +++++++++++++++++--------------------------- lib/libalpm/remove.c | 4 +- lib/libalpm/trans.c | 53 +++++++++++++++++++++++++++++++++----------------- lib/libalpm/trans.h | 4 +- 4 files changed, 58 insertions(+), 51 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 170d09e..33b85c0 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -452,17 +452,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { int i, ret = 0, errors = 0; - char scriptlet[PATH_MAX]; - int is_upgrade = 0; + int is_upgrade; alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; ASSERT(trans != NULL, return -1); - snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", - _alpm_db_path(db), newpkg->name, newpkg->version); - /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); if(local) { @@ -474,30 +470,23 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, goto cleanup; } - EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); - _alpm_log(handle, ALPM_LOG_DEBUG, "upgrading package %s-%s\n", - newpkg->name, newpkg->version); - /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - /* pre_upgrade scriptlet */ - if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_upgrade", newpkg->version, local->version); - } + EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); } else { is_upgrade = 0; - EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); - _alpm_log(handle, ALPM_LOG_DEBUG, "adding package %s-%s\n", - newpkg->name, newpkg->version); + } - /* pre_install scriptlet */ - if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, newpkg->origin_data.file, - "pre_install", newpkg->version, NULL); - } + _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", + is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + /* pre_install/pre_upgrade scriptlet */ + if(alpm_pkg_has_scriptlet(newpkg) && + !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { + const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install"; + _alpm_runscriptlet(handle, newpkg->origin_data.file, + scriptlet_name, newpkg->version, NULL, 1); } /* we override any pre-set reason if we have alldeps or allexplicit set */ @@ -661,13 +650,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - if(is_upgrade) { - _alpm_runscriptlet(handle, scriptlet, "post_upgrade", - newpkg->version, oldpkg ? oldpkg->version : NULL); - } else { - _alpm_runscriptlet(handle, scriptlet, "post_install", - newpkg->version, NULL); - } + char scriptlet[PATH_MAX]; + const char *scriptlet_name; + snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", + _alpm_db_path(db), newpkg->name, newpkg->version); + scriptlet_name = is_upgrade ? "post_upgrade" : "post_install"; + + _alpm_runscriptlet(handle, scriptlet, scriptlet_name, + newpkg->version, oldpkg ? oldpkg->version : NULL, 0); } if(is_upgrade) { diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index a3aa4a5..7f917fa 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -376,7 +376,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "pre_remove", pkgver, NULL, 0); } } @@ -453,7 +453,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { - _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL); + _alpm_runscriptlet(handle, scriptlet, "post_remove", pkgver, NULL, 0); } } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index fbc5fee..cb97a4a 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -275,40 +275,50 @@ static int grep(const char *fn, const char *needle) return 0; } -int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, - const char *script, const char *ver, const char *oldver) +int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, + const char *script, const char *ver, const char *oldver, int is_archive) { - char scriptfn[PATH_MAX]; char cmdline[PATH_MAX]; - char tmpdir[PATH_MAX]; char *argv[] = { "sh", "-c", cmdline, NULL }; - char *scriptpath; + char *tmpdir, *scriptfn = NULL, *scriptpath; int retval = 0; + size_t len; - if(_alpm_access(handle, NULL, installfn, R_OK) != 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); + if(_alpm_access(handle, NULL, filepath, R_OK) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", filepath); return 0; } - /* creates a directory in $root/tmp/ for copying/extracting the scriptlet */ - snprintf(tmpdir, PATH_MAX, "%stmp/", handle->root); + if(!is_archive && !grep(filepath, script)) { + /* script not found in scriptlet file; we can only short-circuit this early + * if it is an actual scriptlet file and not an archive. */ + return 0; + } + + /* create a directory in $root/tmp/ for copying/extracting the scriptlet */ + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + MALLOC(tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(tmpdir, len, "%stmp/", handle->root); if(access(tmpdir, F_OK) != 0) { _alpm_makepath_mode(tmpdir, 01777); } - snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", handle->root); + snprintf(tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); if(mkdtemp(tmpdir) == NULL) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); + free(tmpdir); return 1; } /* either extract or copy the scriptlet */ - snprintf(scriptfn, PATH_MAX, "%s/.INSTALL", tmpdir); - if(strcmp(script, "pre_upgrade") == 0 || strcmp(script, "pre_install") == 0) { - if(_alpm_unpack_single(handle, installfn, tmpdir, ".INSTALL")) { + len += strlen("/.INSTALL"); + MALLOC(scriptfn, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); + snprintf(scriptfn, len, "%s/.INSTALL", tmpdir); + if(is_archive) { + if(_alpm_unpack_single(handle, filepath, tmpdir, ".INSTALL")) { retval = 1; } } else { - if(_alpm_copyfile(installfn, scriptfn)) { + if(_alpm_copyfile(filepath, scriptfn)) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno)); retval = 1; } @@ -317,8 +327,8 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, goto cleanup; } - if(!grep(scriptfn, script)) { - /* script not found in scriptlet file */ + if(is_archive && !grep(scriptfn, script)) { + /* script not found in extracted scriptlet file */ goto cleanup; } @@ -338,10 +348,17 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, retval = _alpm_run_chroot(handle, "/bin/sh", argv); cleanup: - if(_alpm_rmrf(tmpdir)) { - _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); + if(scriptfn && unlink(scriptfn)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove %s\n"), scriptfn); + } + if(rmdir(tmpdir)) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("could not remove tmpdir %s\n"), tmpdir); } + free(scriptfn); + free(tmpdir); return retval; } diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index 38f45ff..ff944b0 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -47,8 +47,8 @@ struct __alpm_trans_t { void _alpm_trans_free(alpm_trans_t *trans); int _alpm_trans_init(alpm_trans_t *trans, alpm_transflag_t flags); -int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, - const char *script, const char *ver, const char *oldver); +int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, + const char *script, const char *ver, const char *oldver, int is_archive); #endif /* _ALPM_TRANS_H */ -- 1.7.6.4

1 1

[pacman-dev] [PATCH] Remove redundant "removal" output in pure remove operation
by Allan McRae 30 Sep '11

30 Sep '11

Printing "[removal]" beside all package names is redundant when all packages are being removed (i.e. when using -R). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 748c0e9..34cdc8c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -849,6 +849,9 @@ static void _display_targets(alpm_list_t *targets) if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install)); + } else if(isize == 0) { + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->remove), + alpm_pkg_get_version(target->remove)); } else { pm_asprintf(&str, "%s-%s [removal]", alpm_pkg_get_name(target->remove), alpm_pkg_get_version(target->remove)); -- 1.7.6.4

2 5

[pacman-dev] [PATCH] pacman-key: remove errexit flag from shebang
by Dave Reisner 30 Sep '11

30 Sep '11

We're ill equipped to be using this flag as we don't trap and respond to the ERR signal. The result is that if is ever tripped, pacman-key will instantly exit with no indication of why. At the same time, we're already fairly good about doing our own error checking and verbalizing it before dying. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- rage. scripts/pacman-key.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 8642928..1df7bb6 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian -- 1.7.6.4

1 0