diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-08 09:49:09 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-08 09:49:09 +0200 |
| commit | dfaeb6bb2ca8311ac418a16c30006eb7d0534d71 (patch) | |
| tree | 227f127eb1a35e20689b1b60b4dbe5255c7e9a7f | |
| parent | 11ba7a0e8a253bff53778688ee174f42c1513738 (diff) | |
| parent | 87072ff63907ce6040be7e59b9b07fd891a8254a (diff) | |
| download | pacman-dfaeb6bb2ca8311ac418a16c30006eb7d0534d71.tar.gz pacman-dfaeb6bb2ca8311ac418a16c30006eb7d0534d71.tar.xz | |
Merge remote-tracking branch 'allan/working'
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/pacman-key.sh.in | 14 | ||||
| -rw-r--r-- | scripts/pkgdelta.sh.in | 2 | ||||
| -rw-r--r-- | src/pacman/callback.c | 8 |
4 files changed, 17 insertions, 9 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7c64e81c..fd9b20d1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,7 +47,7 @@ edit = sed \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@DUPATH[@]|$(DUPATH)|g' \ - -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g' + -e 's|@configure_input[@]|Generated from $@.sh.in; do not edit by hand.|g' ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 80f8bc7c..20ec20fa 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -87,12 +87,12 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # 'key', 'equal sign' and 'value' can be surrounded by random whitespace # Usage: get_from "$file" "$key" # returns the value for the first matching key in the file get_from() { - while read key _ value; do - if [[ $key = $2 ]]; then - echo "$value" - break - fi - done < "$1" + while read key _ value; do + if [[ $key = $2 ]]; then + echo "$value" + break + fi + done < "$1" } reload_keyring() { @@ -328,3 +328,5 @@ case "${command}" in error "$(gettext "Unknown command:") $command" usage; exit 1 ;; esac + +# vim: set ts=2 sw=2 noet: diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index ecca4277..d17b41d2 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -163,3 +163,5 @@ if ! type xdelta3 &>/dev/null; then fi create_xdelta "$1" "$2" + +# vim: set ts=2 sw=2 noet: diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f1c314f0..4a025742 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -256,8 +256,12 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { switch(event) { case PM_TRANS_CONV_INSTALL_IGNOREPKG: - *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + if(!config->op_s_downloadonly) { + *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), + alpm_pkg_get_name(data1)); + } else { + *response = 1; + } break; case PM_TRANS_CONV_REPLACE_PKG: *response = yesno(_(":: Replace %s with %s/%s?"), |