diff options
| -rw-r--r-- | contrib/PKGBUILD.vim | 2 | ||||
| -rw-r--r-- | contrib/bash_completion.in | 8 | ||||
| -rw-r--r-- | contrib/zsh_completion.in | 2 | ||||
| -rw-r--r-- | lib/libalpm/trans.c | 4 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 6 |
5 files changed, 13 insertions, 9 deletions
diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 91570637..cf264f93 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,7 +211,7 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|fakeroot\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags\)/ contained +syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags\)/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 15e1daca..224b8f92 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -75,10 +75,10 @@ _makepkg() { COMPREPLY=() _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then - opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch - install key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract - noprepare noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg - skippgpcheck source syncdeps verifysource version' + opts=('allsource asdeps check clean config force geninteg help holdver ignorearch install + key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare + noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck + source syncdeps verifysource version' '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 f2ff7c8a..1cae1de0 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -586,11 +586,11 @@ _makepkg_longopts=( '--syncdeps[Install missing dependencies with pacman]' '--source[Generate a source-only tarball without downloading sources]' '--allsource[Generate a source-only tarball including downloaded source]' - '--asroot[Allow makepkg to run as root user]' '--check[Run check() function in the PKGBUILD]' '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' '--holdver[Prevent automatic version bumping for development PKGBUILDs]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' + '--noarchive[Do not create the archive at the end of the build process]' '--nocheck[Do not run the check() function in the PKGBUILD]' '--noprepare[Do not run the prepare() function in the PKGBUILD]' '--nosign[Do not create a signature for the package]' diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e680feb3..48745d3b 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -192,13 +192,17 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) if(trans->add == NULL) { if(_alpm_remove_packages(handle, 1) == -1) { /* pm_errno is set by _alpm_remove_packages() */ + alpm_errno_t save = handle->pm_errno; alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction failed\n"); + handle->pm_errno = save; return -1; } } else { if(_alpm_sync_commit(handle, data) == -1) { /* pm_errno is set by _alpm_sync_commit() */ + alpm_errno_t save = handle->pm_errno; alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction failed\n"); + handle->pm_errno = save; return -1; } } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 00beb76e..716ed808 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -605,7 +605,7 @@ extract_git() { exit 1 fi cd_safe "$srcdir" - elif ! git clone "$dir"; then + elif ! git clone "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -1819,7 +1819,7 @@ tidy_install() { msg2 "$(gettext "Removing static library files...")" local l while read -rd '' l; do - if [[ -f "${l%.a}.so" ]]; then + if [[ -f "${l%.a}.so" || -h "${l%.a}.so" ]]; then rm "$l" fi done < <(find . ! -type d -name "*.a" -print0) @@ -1833,7 +1833,7 @@ tidy_install() { # check existence of backup files local file for file in "${backup[@]}"; do - if [[ ! -f $file && ! -h $file ]]; then + if [[ ! -f $file ]]; then warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" fi done |