diff options
author | Allan McRae <allan@archlinux.org> | 2011-06-08 15:34:47 +1000 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2011-06-08 15:34:47 +1000 |
commit | 45fe92bf39a193252d0fc5e44526877002297659 (patch) | |
tree | fc9e02fe041d8a2ce794bebec1d7d352b402d370 | |
parent | 8c6a636cd970c19e7a79bb17c484b28454da877d (diff) | |
download | pacman-45fe92bf39a193252d0fc5e44526877002297659.tar.xz |
Remove incorrect output with download only and IgnorePkg
When only downloading a package that is in IgnorePkg, pacman
incorrectly asks about installing.
e.g. with <pkg> in IgnorePkg in pacman.conf:
> pacman -Sddw <pkg>
:: <pkg> is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n]
This output is now silenced when downloading only.
Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r-- | src/pacman/callback.c | 8 |
1 files changed, 6 insertions, 2 deletions
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?"), |