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

Merge remote-tracking branch 'allan/working'

Browse source
This commit is contained in:
Dan McGee 2011-06-08 02:49:09 -05:00
commit dfaeb6bb2c
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/Makefile.am
View file

@ -47,7 +47,7 @@ edit = sed \
-e 's|@SIZECMD[@]|$(SIZECMD)|g' \ -e 's|@SIZECMD[@]|$(SIZECMD)|g' \
-e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \ -e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \
-e 's|@DUPATH[@]|$(DUPATH)|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 ## 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 ## prefix etc. changes. Use chmod -w to prevent people from editing the

14
scripts/pacman-key.sh.in
View file

@ -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 # '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 # Usage: get_from "$file" "$key" # returns the value for the first matching key in the file
get_from() { get_from() {
while read key _ value; do while read key _ value; do
if [[ $key = $2 ]]; then if [[ $key = $2 ]]; then
echo "$value" echo "$value"
break break
fi fi
done < "$1" done < "$1"
} }
reload_keyring() { reload_keyring() {
@ -328,3 +328,5 @@ case "${command}" in
error "$(gettext "Unknown command:") $command" error "$(gettext "Unknown command:") $command"
usage; exit 1 ;; usage; exit 1 ;;
esac esac
# vim: set ts=2 sw=2 noet:

2
scripts/pkgdelta.sh.in
View file

@ -163,3 +163,5 @@ if ! type xdelta3 &>/dev/null; then
fi fi
create_xdelta "$1" "$2" create_xdelta "$1" "$2"
# vim: set ts=2 sw=2 noet:

8
src/pacman/callback.c
View file

@ -256,8 +256,12 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
{ {
switch(event) { switch(event) {
case PM_TRANS_CONV_INSTALL_IGNOREPKG: case PM_TRANS_CONV_INSTALL_IGNOREPKG:
*response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"), if(!config->op_s_downloadonly) {
alpm_pkg_get_name(data1)); *response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
alpm_pkg_get_name(data1));
} else {
*response = 1;
}
break; break;
case PM_TRANS_CONV_REPLACE_PKG: case PM_TRANS_CONV_REPLACE_PKG:
*response = yesno(_(":: Replace %s with %s/%s?"), *response = yesno(_(":: Replace %s with %s/%s?"),