From dc4ca54219ef5d536b2290cc185828cbdd1b2c7b Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Fri, 26 Oct 2007 12:04:00 +0000 Subject: [PATCH] - when --skip-interactive is specified, skip also patches having a license to confirm, even if they are not marked as interactive (#236360) --- src/zypper-misc.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc index 5005159..2a7f72f 100644 --- a/src/zypper-misc.cc +++ b/src/zypper-misc.cc @@ -1321,10 +1321,10 @@ void mark_patch_updates( bool skip_interactive ) Patch::constPtr patch = asKind(res); if (attempt == 1 || patch->affects_pkg_manager ()) { // #221476 - if (skip_interactive && patch->interactive()) { - // Skipping a patch because it is interactive and - // --skip-interactive is requested. %s is a name of a - // patch + if (skip_interactive && (patch->interactive() || !patch->licenseToConfirm().empty())) { + // Skipping a patch because it is marked as interactive or has + // license to confirm and --skip-interactive is requested. + // TranslatorExplanation %s is the name of a patch cerr << format (_("WARNING: %s is interactive, skipped.")) % res << endl; } -- 2.7.4