diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-02-23 02:10:56 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-02-23 02:10:56 +0000 |
| commit | d584d8c06842cec99bff1e07b565ee0511cfade8 (patch) | |
| tree | b1563526d705c6d52a061de93fe4c738effcceb2 /src | |
| parent | c799433e423d5bdd6737b81483de82b9e98aed46 (diff) | |
| download | pacman-d584d8c06842cec99bff1e07b565ee0511cfade8.tar.xz | |
* Modified the handling and output w.r.t. IgnorePkg entries. -Sy always ignores
these packages, but -S explicitly asks for confirmation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/trans.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pacman/trans.c b/src/pacman/trans.c index b5581d75..ede9b78d 100644 --- a/src/pacman/trans.c +++ b/src/pacman/trans.c @@ -167,11 +167,15 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, } else { *response = 0; } - } else { + } else if(data2) { snprintf(str, LOG_STR_LEN, _(":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "), alpm_pkg_get_name(data1), alpm_pkg_get_name(data2)); *response = yesno(str); + } else { + snprintf(str, LOG_STR_LEN, _(":: %s is in IgnorePkg. Install anyway? [Y/n] "), + alpm_pkg_get_name(data1)); + *response = yesno(str); } break; case PM_TRANS_CONV_REMOVE_HOLDPKG: |