- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix typo in help message
by Eric Bélanger 16 Feb '12

16 Feb '12

Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/pacsysclean.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in index 17f7681..28c1493 100755 --- a/contrib/pacsysclean.in +++ b/contrib/pacsysclean.in @@ -13,7 +13,7 @@ usage() { echo "Usage: $myname [options]" echo echo "Options:" - echo " -o <options> Specify custom pacman query options (e.g., dt)" + echo " -o <options> Specify custom pacman query options (e.g., -dt)" echo " -h, --help Show this help message and exit" } -- 1.7.9.1

2 2

[pacman-dev] [PATCH] pacsysclean: Fix script description and accept -o option without hyphen
by Eric Bélanger 16 Feb '12

16 Feb '12

Close FS#28434 Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- contrib/pacsysclean.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in index 17f7681..162530e 100755 --- a/contrib/pacsysclean.in +++ b/contrib/pacsysclean.in @@ -1,6 +1,6 @@ #!/bin/bash -# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# pacsysclean - Sort installed packages by increasing installed size. Useful for system clean-up. declare -r myname='pacsysclean' declare -r myver='@PACKAGE_VERSION@' @@ -8,7 +8,7 @@ declare -r myver='@PACKAGE_VERSION@' PACMAN_OPTS= usage() { - echo "$myname - Sort installed packages by decreasing installed size." + echo "$myname - Sort installed packages by increasing installed size." echo echo "Usage: $myname [options]" echo @@ -35,6 +35,9 @@ fi IFS=$'\n' name="^Name.*: (.*)$" size="^Installed Size.*: (.*) KiB$" + +[[ $PACMAN_OPTS != -* ]] && PACMAN_OPTS="-$PACMAN_OPTS" + for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do if [[ $line =~ $name ]]; then printf "%s\t" ${BASH_REMATCH[1]} -- 1.7.9.1

1 0

[pacman-dev] [PATCH 1/3] makepkg: restrict usage of errexit to user functions
by Dave Reisner 16 Feb '12

16 Feb '12

It's expected that this will lead to unwanted behavior, and needs widespread testing. It's desirable to commit this for a few reasons: - there's no reason we can't do our own error checking for code that we write. - it avoids the need for ||true hacks scattered about in the code. - it makes us immune to upstream changes in exit codes (FS#28248) Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Allan, just making sure we're on the same page -- this _will_ cause breakage, and the next patch in this series addresses one specific case. I figure getting this patch in now gives us "ample time" to uncover and fix all these before the next release. scripts/makepkg.sh.in | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f0a2252..61c95af 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # # makepkg - make packages compatible for use with pacman # @configure_input@ @@ -430,13 +430,10 @@ run_pacman() { check_deps() { (( $# > 0 )) || return 0 - # Disable error trap in pacman subshell call as this breaks bash-3.2 compatibility - # Also, a non-zero return value is not unexpected and we are manually dealing them - set +E local ret=0 local pmout - pmout=$(run_pacman -T "$@") || ret=$? - set -E + pmout=$(run_pacman -T "$@") + ret=$? if (( ret == 127 )); then #unresolved deps echo "$pmout" @@ -469,13 +466,7 @@ handle_deps() { fi # we might need the new system environment - # avoid triggering the ERR trap and exiting - set +e - local restoretrap=$(trap -p ERR) - trap - ERR source /etc/profile &>/dev/null - eval $restoretrap - set -e return $R_DEPS_SATISFIED } @@ -867,6 +858,23 @@ error_function() { exit 2 # $E_BUILD_FAILED } +run_function_safe() { + local restoretrap + + set -e + set -E + + restoretrap=$(trap -p ERR) + trap 'error_function $pkgfunc' ERR + + run_function "$1" + + eval $restoretrap + + set +E + set +e +} + run_function() { if [[ -z $1 ]]; then return 1 @@ -892,7 +900,6 @@ run_function() { local shellopts=$(shopt -p) local ret=0 - local restoretrap if (( LOGGING )); then local fullver=$(get_full_version) local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" @@ -914,18 +921,12 @@ run_function() { tee "$BUILDLOG" < "$logpipe" & local teepid=$! - restoretrap=$(trap -p ERR) - trap 'error_function $pkgfunc' ERR $pkgfunc &>"$logpipe" - eval $restoretrap wait $teepid rm "$logpipe" else - restoretrap=$(trap -p ERR) - trap 'error_function $pkgfunc' ERR $pkgfunc 2>&1 - eval $restoretrap fi # reset our shell options eval "$shellopts" @@ -943,11 +944,11 @@ run_build() { [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi - run_function "build" + run_function_safe "build" } run_check() { - run_function "check" + run_function_safe "check" } run_package() { @@ -958,7 +959,7 @@ run_package() { pkgfunc="package_$1" fi - run_function "$pkgfunc" + run_function_safe "$pkgfunc" } tidy_install() { @@ -1973,8 +1974,6 @@ for signal in TERM HUP QUIT; do trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" done trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT -trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR -set -E # preserve environment variables and canonicalize path [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) -- 1.7.9

2 7

[pacman-dev] Move package to cache when installed with -U
by jjacky 15 Feb '12

15 Feb '12

Hey, So I would be interested in such a feature, and I found it being rejected as FS#15143, but I have some questions. It seems the main reason it was rejected was this: " My second argument against this is that users sometimes do local rebuild of official packages, and maybe don't want to mix these packages with official ones in the cache (which could cause integrity check failures next time they upgrade their system). " And I don't understand. Why/how would there be an integrity check failure on upgrade ? I thought integrity check meant that the package(s) about to be installed was being checked. So, during an upgrade, there would be no reason to check this already installed package, no? And if there was an update available, it's the integrity of the newly downloaded package that would be checked, and it would have no reason to fail. What am I not understanding/misunderstanding here? Because I do like this idea and, unless there is an inherent problem with it of course, I might be interested into looking to make a patch to add such an option. Thanks, -jacky Ref: https://bugs.archlinux.org/task/15143

2 4

[pacman-dev] [PATCH 1/2] Revert "Enable recursive/needed sync on SyncFirst"
by Dan McGee 15 Feb '12

15 Feb '12

This reverts commit 09034520325efcc2e684f05fa7a99c02bad1f5be. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f10e6b..fcc887a 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -963,8 +963,6 @@ int pacman_sync(alpm_list_t *targets) FREELIST(targs); targs = packages; config->flags = 0; - config->flags |= ALPM_TRANS_FLAG_RECURSE; - config->flags |= ALPM_TRANS_FLAG_NEEDED; config->op_s_upgrade = 0; } else { FREELIST(packages); -- 1.7.9

1 1

[pacman-dev] macros needed when using libalpm
by jjacky 15 Feb '12

15 Feb '12

Hi, Just a quick question, it might be pretty obvious but I'm still relatively new at this, so excuse my "noobness." While working on a little app using libalpm, I wanted to use the download callback. But I had a problem, because the total size would always be zero. I didn't understand why it didn't work, especially since it did for pacman, which seemed to do exactly the same as I did. After investigation, I figured out that this was because I needed to use a macro when compiling, namely: #define _FILE_OFFSET_BITS 64 Apparently one of the things this does is turn off_t (type of both size parameters of the dl callback, among other things) into off64_t. I'm guessing that means one more byte to store the data, and therefore explains why with my "regular" off_t I didn't get the correct values. Thing is, I'm not sure how I was supposed to know that using this macro was required of me in order to get things to work properly, so my questions are: - how was I supposed to know? :) As in, is there any indication or something about this written somewhere that I missed? I did look at the README and such, but couldn't find anything. (and if not, shouldn't there be, maybe?) Or is this just usual/common knowledge or something? - any chance there is/are other such things I need to use for things to work properly? I'm guessing not, but just in case... Thanks, -jacky

2 2

[pacman-dev] [PATCH] scripts: unset CDPATH if cd is used
by Dan McGee 14 Feb '12

14 Feb '12

This wonderful/awful little bash shell variable wrecks havoc on `cd` calls in shell scripts. Unset CDPATH in makepkg where we use `cd` quite heavily. In pacman-optimize, we can move the change directory logic into the bsdtar call so we are left with no usages of `cd` in the script. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 ++ scripts/pacman-optimize.sh.in | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 80bb1c9..5e8687e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -36,6 +36,8 @@ export TEXTDOMAINDIR='@localedir@' # file -i does not work on Mac OSX unless legacy mode is set export COMMAND_MODE='legacy' +# Ensure CDPATH doesn't screw with our cd calls +unset CDPATH myver='@PACKAGE_VERSION@' confdir='@sysconfdir@' diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 47d8814..8a4e722 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -122,8 +122,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old" # step 2: tar it up msg "$(gettext "Tar'ing up %s...")" "$dbroot" -cd "$dbroot" -bsdtar -czf "$workdir/pacman-db.tar.gz" ./ +bsdtar -czf "$workdir/pacman-db.tar.gz" -C "$dbroot" ./ if (( $? )); then rm -rf "$workdir" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" -- 1.7.9

2 1

[pacman-dev] [PATCH] makepkg: fix syntax error in remove_deps
by Christoph Vigano 14 Feb '12

14 Feb '12

This fixes a problem that occurs if you tell makepkg to remove installed dependencies (just to be sure) but there are none. As the $ was missing in front of deplist, the check never happened and 'pacman -Rn' was called which obviously failed. Greetings, Christoph Signed-off-by: Christoph Vigano <mail(a)cvigano.de> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f0a2252..e895ec7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -519,7 +519,7 @@ remove_deps() { local deplist deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}") || true)) - if [[ -z deplist ]]; then + if [[ -z $deplist ]]; then return fi -- 1.7.9

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.2-132-gc7321a7
by dan＠archlinux.org 13 Feb '12

13 Feb '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 c7321a7b80aebeacb05ad5ab9d096779403b1758 (commit) via 115c0381c235100d7b05d9751767017a9ee325c4 (commit) via 48d63048f1b6f8e2ce2a3bd3a3fd08997a5562fc (commit) via 991be2867259ee58d43a5005eec466ef2b546af5 (commit) via e530993392dc2ac54e566a45df6c974aa68aaa23 (commit) via 7a3f59cd66a4f70641b863ebaaf52674b921bf3c (commit) via 8741551dc94d506df72b5ae8453bca1e4d50dbab (commit) via 3ba5391839b34823e97574cba2952d732c2729e0 (commit) via 20a16f55b32da071d362c2fa3faf1f55285d13a9 (commit) via b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (commit) via e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (commit) via f8ae60bc28644fd46810fbab7d5acf143586dfd4 (commit) via 294f0fdf4df361e0d553eb650e1aacdb83f7bdf5 (commit) via 31432edcbe484a5fca01abff77359061ae813fcc (commit) via 9b1ab3d76713d99a11d8da2204557856d59bd3a5 (commit) via ea32924c626b828b3752c021362a6e0e7f79885c (commit) via 594524146906a2dfe1ea334a90f88aec24d8833a (commit) from f55be4897799c5a6dcb454455ad9edcfc36f8495 (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 c7321a7b80aebeacb05ad5ab9d096779403b1758 Merge: 115c038 b4f5a63 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Feb 13 10:12:39 2012 -0600 Merge branch 'maint' Conflicts: lib/libalpm/sync.c src/util/pactree.c commit 115c0381c235100d7b05d9751767017a9ee325c4 Author: Nathan Phillip Brink <binki(a)gentoo.org> Date: Tue Oct 18 03:42:17 2011 +0000 Use AM_PATH_GPGME macro from gpgme instead of home-built gpgme detection. Fixes compilation on Gentoo, where CPPFLAGS=-I/usr/include/gpgme is necessary. The AC_SYS_LARGEFILE macro call has to be before the GPGME checks, otherwise the GPGME header gives an error about ABI incompatibilities. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 48d63048f1b6f8e2ce2a3bd3a3fd08997a5562fc Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 12 11:59:52 2012 +1000 Add gpgme m4 autoconf macro file Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 991be2867259ee58d43a5005eec466ef2b546af5 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Feb 12 09:50:34 2012 +1000 Do not check for ALPM_ERR_PKG_INVALID_ARCH on remove operation alpm_trans_prepare can not return ALPM_ERR_PKG_INVALID_ARCH on a remove operation so there is no point in checking for it. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e530993392dc2ac54e566a45df6c974aa68aaa23 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 16:56:02 2012 +1000 testpkg: set gpgdir Without setting gpgdir, testpkg outputs: warning: Public keyring not found; have you run 'pacman-key --init'? Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7a3f59cd66a4f70641b863ebaaf52674b921bf3c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 16:17:59 2012 +1000 Reset errno before opening archive Set errno to 0 at the start of _alpm_open_archive as it is not set when archive_read_open_fd fails. This can result in _alpm_pkg_load_internal thinking errno == ENOENT and setting the wrong pm_errno. e.g. Before: > testpkg pacman-4.0.1-4-i686.pkg.tar.gz.sig error: could not open file pacman-4.0.1-4-i686.pkg.tar.gz.sig: Unrecognized archive format Cannot find the given file. After: > testpkg pacman-4.0.1-4-i686.pkg.tar.gz.sig error: could not open file pacman-4.0.1-4-i686.pkg.tar.gz.sig: Unrecognized archive format Cannot open the given file. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8741551dc94d506df72b5ae8453bca1e4d50dbab Author: Allan McRae <allan(a)archlinux.org> Date: Sat Feb 11 15:16:40 2012 +1000 Move ROOTDIR definition into config.h This was the only variable of its kind when a define was done on the compiler command line. Move it into config.h instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3ba5391839b34823e97574cba2952d732c2729e0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Feb 10 16:26:37 2012 +1000 Allow specifying shell for running scriptlets Some distributions insist on using bash specific commands in their install scripts under the assumption that "sh" is a symlink to bash. This can causes issues if (e.g.) their users what to change sh to point at another shell, such as dash, that does not support these features. Add a configure option to explicitly set the shell being used to run install scripts. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20a16f55b32da071d362c2fa3faf1f55285d13a9 Author: Florian Pritz <bluewind(a)xinu.at> Date: Tue Feb 7 18:43:59 2012 +0100 use _alpm_access in a few more places for increased debugging info pacman -U <pkg> returns a bogus "could not find or read package" if the file is on a fuse file system that doesn't allow root access. Debug output isn't very helpful here either so we should log why the access check failed. The other 2 checks already log something when failing so logging a more specific error won't hurt either. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 25 ++++ configure.ac | 65 +++++++-- doc/index.txt | 1 + lib/libalpm/alpm.h | 6 +- lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 +- lib/libalpm/po/fr.po | 25 ++-- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 3 +- m4/gpgme.m4 | 307 +++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 13 ++- scripts/po/ca.po | 90 ++++++------- scripts/po/cs.po | 61 ++------ scripts/po/da.po | 35 ++--- scripts/po/de.po | 98 +++++++------- scripts/po/el.po | 89 +++++------- scripts/po/en_GB.po | 7 +- scripts/po/es.po | 71 +++------- scripts/po/fi.po | 217 ++++++++++++++--------------- scripts/po/fr.po | 179 ++++++++++++------------- scripts/po/hu.po | 93 ++++++------- scripts/po/it.po | 90 +++++------- scripts/po/kk.po | 50 ++----- scripts/po/lt.po | 306 ++++++++++++++++++++--------------------- scripts/po/nb.po | 110 +++++++--------- scripts/po/pacman-scripts.pot | 5 +- scripts/po/pl.po | 58 ++------ scripts/po/pt.po | 104 ++++++-------- scripts/po/pt_BR.po | 115 +++++++-------- scripts/po/ro.po | 91 +++++------- scripts/po/ru.po | 57 ++------ scripts/po/sk.po | 96 ++++++------- scripts/po/sr.po | 61 ++------ scripts%2Fpo%2Fsr(a)latin.po | 61 ++------ scripts/po/sv.po | 36 ++---- scripts/po/tr.po | 90 +++++------- scripts/po/uk.po | 65 ++------- scripts/po/zh_CN.po | 92 +++++------- scripts/po/zh_TW.po | 7 +- src/pacman/Makefile.am | 1 - src/pacman/pacman.c | 10 +- src/pacman/po/fi.po | 34 +++--- src/pacman/po/fr.po | 61 ++++---- src/pacman/po/hu.po | 6 +- src/pacman/po/it.po | 17 +-- src/pacman/remove.c | 6 - src/pacman/util.c | 2 +- src/util/Makefile.am | 3 +- src/util/pactree.c | 12 +- src/util/testpkg.c | 3 + 51 files changed, 1504 insertions(+), 1538 deletions(-) create mode 100644 m4/gpgme.m4 hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.2-1-gb4f5a63
by dan＠archlinux.org 13 Feb '12

13 Feb '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 b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (commit) from e7bc1e3c9a122e4daeb6dcf23eebdd55711138a5 (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 b4f5a63e7fee5d04949e290bd63e5f0e94bd211e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Feb 13 10:59:26 2012 -0500 lib/sync: use full delta size as max download size The max filesize for a delta download must be the full size of the delta file, not just what's remaining. Fixes FS#28345 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0