bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2010-06-20 21:01:32 -05:00
commit 67d71ea932
4 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -100,8 +100,8 @@ AC_ARG_ENABLE(internal-download,
# Help line for documentation # Help line for documentation
AC_ARG_ENABLE(doc, AC_ARG_ENABLE(doc,
AS_HELP_STRING([--enable-doc], [run make in doc/ dir]), AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]),
[wantdoc=$enableval], [wantdoc=no]) [wantdoc=$enableval], [wantdoc=yes])
# Help line for doxygen # Help line for doxygen
AC_ARG_ENABLE(doxygen, AC_ARG_ENABLE(doxygen,
@ -272,7 +272,7 @@ if test "x$wantdoc" = "xyes" ; then
fi fi
wantdoc=yes wantdoc=yes
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no, disabled by configure])
wantdoc=no wantdoc=no
fi fi
AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes") AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes")

6
lib/libalpm/sync.c
View file

@ -291,7 +291,11 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
} }
if(!found) { 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); return(0);

10
scripts/makepkg.sh.in
View file

@ -265,11 +265,11 @@ check_buildenv() {
# ? - not found # ? - not found
## ##
in_opt_array() { in_opt_array() {
local needle="${1,,}"; shift local needle=$(tr '[:upper:]' '[:lower:]' <<< $1); shift
local opt local opt
for opt in "$@"; do for opt in "$@"; do
opt="${opt,,}" opt=$(tr '[:upper:]' '[:lower:]' <<< $opt)
if [[ $opt = $needle ]]; then if [[ $opt = $needle ]]; then
echo 'y' # Enabled echo 'y' # Enabled
return return
@ -554,7 +554,7 @@ generate_checksums() {
local integ local integ
for integ in ${integlist[@]}; do for integ in ${integlist[@]}; do
integ="${integ,,}" integ=$(tr '[:upper:]' '[:lower:]' <<< "$integ")
case "$integ" in case "$integ" in
md5|sha1|sha256|sha384|sha512) : ;; md5|sha1|sha256|sha384|sha512) : ;;
*) *)
@ -617,7 +617,7 @@ check_checksums() {
fi fi
if (( $found )) ; then if (( $found )) ; then
local expectedsum="${integrity_sums[$idx],,}" local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}")
local realsum="$(openssl dgst -${integ} "$file")" local realsum="$(openssl dgst -${integ} "$file")"
realsum="${realsum##* }" realsum="${realsum##* }"
if [[ $expectedsum = $realsum ]]; then 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 " Are you sure you wish to do this? ")"
echo -n "$(gettext "[y/N]")" echo -n "$(gettext "[y/N]")"
read answer read answer
answer="${answer^^}" answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer")
if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then
rm "$SRCDEST"/* rm "$SRCDEST"/*
if (( $? )); then if (( $? )); then

10
test/pacman/tests/ignore006.py Normal file
View file

@ -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")