| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | lib/libalpm/sync.c | 6 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 10 | ||||
| -rw-r--r-- | test/pacman/tests/ignore006.py | 10 |
diff --git a/configure.ac b/configure.ac index 008975b8..4faf20d9 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,8 @@ AC_ARG_ENABLE(internal-download, # Help line for documentation AC_ARG_ENABLE(doc, - AS_HELP_STRING([--enable-doc], [run make in doc/ dir]), - [wantdoc=$enableval], [wantdoc=no]) + AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]), + [wantdoc=$enableval], [wantdoc=yes]) # Help line for doxygen AC_ARG_ENABLE(doxygen, @@ -272,7 +272,7 @@ if test "x$wantdoc" = "xyes" ; then fi wantdoc=yes else - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no, disabled by configure]) wantdoc=no fi AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes") diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 67afd397..68ee8dc7 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -291,7 +291,11 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target) } if(!found) { - RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + /* pass through any 'found but ignored' errors */ + if(pm_errno != PM_ERR_PKG_IGNORED) { + pm_errno = PM_ERR_PKG_NOT_FOUND; + } + return(-1); } return(0); diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c6bc7382..dbc40471 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -265,11 +265,11 @@ check_buildenv() { # ? - not found ## in_opt_array() { - local needle="${1,,}"; shift + local needle=$(tr '[:upper:]' '[:lower:]' <<< $1); shift local opt for opt in "$@"; do - opt="${opt,,}" + opt=$(tr '[:upper:]' '[:lower:]' <<< $opt) if [[ $opt = $needle ]]; then echo 'y' # Enabled return @@ -554,7 +554,7 @@ generate_checksums() { local integ for integ in ${integlist[@]}; do - integ="${integ,,}" + integ=$(tr '[:upper:]' '[:lower:]' <<< "$integ") case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) @@ -617,7 +617,7 @@ check_checksums() { fi if (( $found )) ; then - local expectedsum="${integrity_sums[$idx],,}" + local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") local realsum="$(openssl dgst -${integ} "$file")" realsum="${realsum##* }" if [[ $expectedsum = $realsum ]]; then @@ -1665,7 +1665,7 @@ if (( CLEANCACHE )); then echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" read answer - answer="${answer^^}" + answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer") if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then rm "$SRCDEST"/* if (( $? )); then diff --git a/test/pacman/tests/ignore006.py b/test/pacman/tests/ignore006.py new file mode 100644 index 00000000..4c1c1cac --- /dev/null +++ b/test/pacman/tests/ignore006.py @@ -0,0 +1,10 @@ +self.description = "Sync with target in ignore list and say no" + +pkg = pmpkg("package1") +self.addpkg2db("sync", pkg) + +self.option["IgnorePkg"] = ["package1"] +self.args = "--ask=1 -S %s" % pkg.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=package1") |