if (ignore_pkgmgmt || patch->restartSuggested())
{
+ Patch::InteractiveFlags ignoreFlags = Patch::NoFlags;
+ ignoreFlags |= (Zypper::instance()->globalOpts().reboot_req_non_interactive) ? Patch::Reboot : Patch::NoFlags;
+
// bnc #221476
- if (_opts.skip_interactive && patch->interactive(Zypper::instance()->globalOpts().reboot_req_non_interactive))
+ if (_opts.skip_interactive && patch->interactiveWhenIgnoring(ignoreFlags))
{
addFeedback(Feedback::PATCH_INTERACTIVE_SKIPPED, patchspec, selected);
return false;
cout << _("Restart Required: ");
cout << (patch->restartSuggested() ? _("Yes") : _("No")) << endl;
- cout << _("Interactive: ") << (patch->interactive(zypper.globalOpts().reboot_req_non_interactive) ? _("Yes") : _("No")) << endl;
+ Patch::InteractiveFlags ignoreFlags = Patch::NoFlags;
+ ignoreFlags |= (zypper.globalOpts().reboot_req_non_interactive) ? Patch::Reboot : Patch::NoFlags;
+
+ cout << _("Interactive: ") << (patch->interactiveWhenIgnoring(ignoreFlags) ? _("Yes") : _("No")) << endl;
printSummaryDesc(pool_item.resolvable());
cout << "category=\"" << patch->category() << "\" ";
cout << "pkgmanager=\"" << (patch->restartSuggested() ? "true" : "false") << "\" ";
cout << "restart=\"" << (patch->rebootSuggested() ? "true" : "false") << "\" ";
- cout << "interactive=\"" << (patch->interactive(zypper.globalOpts().reboot_req_non_interactive) ? "true" : "false") << "\" ";
+
+ Patch::InteractiveFlags ignoreFlags = Patch::NoFlags;
+ ignoreFlags |= (zypper.globalOpts().reboot_req_non_interactive) ? Patch::Reboot : Patch::NoFlags;
+
+ cout << "interactive=\"" << (patch->interactiveWhenIgnoring(ignoreFlags) ? "true" : "false") << "\" ";
cout << "kind=\"patch\"";
cout << ">" << endl;
cout << " <summary>" << xml_encode(patch->summary()) << " </summary>" << endl;
# norootforbuild
Name: @PACKAGE@
-BuildRequires: libzypp-devel >= 9.2.0
+BuildRequires: libzypp-devel >= 9.3.0
BuildRequires: boost-devel >= 1.33.1
BuildRequires: gettext-devel >= 0.15
BuildRequires: readline-devel >= 5.1