Author: jkupec Date: Fri Oct 26 14:04:00 2007 New Revision: 7646 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7646&view=rev Log: - when --skip-interactive is specified, skip also patches having a license to confirm, even if they are not marked as interactive (#236360) Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=7646&r1=7645&r2=7646&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Oct 26 14:04:00 2007 @@ -1321,10 +1321,10 @@ Patch::constPtr patch = asKind<Patch>(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; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org