replaced mark_patch_update with SolverRequester::installPatch

diff --git a/src/RequestFeedback.cc b/src/RequestFeedback.cc
index 54f4cf8..4bac772 100644 (file)
--- a/src/RequestFeedback.cc
+++ b/src/RequestFeedback.cc
@@ -190,9 +190,10 @@ string SolverRequester::Feedback::asUserString(
   {
     ostringstream pname;
     pname << _objsel->name() << "-" << _objsel->edition();
-    string cmd = "zypper rl patch:" + _objsel->name();
+    string cmd1 = "zypper in --force patch:" + _objsel->name();
+    string cmd2 = "zypper rl patch:" + _objsel->name();
     return str::form(_("Patch '%s' is locked. Use '%s' to install it, or unlock it using '%s'."),
-        pname.str().c_str(), "--force", cmd.c_str());
+        pname.str().c_str(), cmd1.c_str(), cmd2.c_str());
   }
 
   case SET_TO_INSTALL:

diff --git a/src/SolverRequester.cc b/src/SolverRequester.cc
index 9980eb6..790610b 100644 (file)
--- a/src/SolverRequester.cc
+++ b/src/SolverRequester.cc
@@ -358,6 +358,19 @@ void SolverRequester::updatePatches()
 
 // ----------------------------------------------------------------------------
 
+bool SolverRequester::installPatch(const zypp::PoolItem & selected)
+{
+  PackageSpec patchspec;
+  patchspec.orig_str = str::form("%s-%s",
+      selected->name().c_str(), selected->edition().asString().c_str());
+  patchspec.parsed_cap =
+      Capability(selected->name(), Rel::EQ, selected->edition(), ResKind::patch);
+
+  return installPatch(patchspec, selected);
+}
+
+// ----------------------------------------------------------------------------
+
 bool SolverRequester::installPatch(
     const PackageSpec & patchspec,
     const PoolItem & selected,
@@ -382,11 +395,8 @@ bool SolverRequester::installPatch(
       }
       else if (selected.isUnwanted())
       {
-        if (_command == ZypperCommand::INSTALL || _command == ZypperCommand::UPDATE)
-        {
-          DBG << "candidate patch " << patch << " is locked" << endl;
-          addFeedback(Feedback::PATCH_UNWANTED, patchspec, selected, selected);
-        }
+        DBG << "candidate patch " << patch << " is locked" << endl;
+        addFeedback(Feedback::PATCH_UNWANTED, patchspec, selected, selected);
       }
       else
       {

diff --git a/src/SolverRequester.h b/src/SolverRequester.h
index 844f7fd..f7647b5 100644 (file)
--- a/src/SolverRequester.h
+++ b/src/SolverRequester.h
@@ -28,6 +28,19 @@ class Out;
 /**
  * Issue various requests to the dependency resolver, based on given
  * arguments (\ref PackageArgs) and options (\ref SolverRequester::Options).
+ *
+ *   SolverRequester::Options sropts;
+ *   sropts.force = cmdoptions.find("force") != cmdoptions.end()
+ *   ...
+ *
+ *   vector<string> args;
+ *   args.push_back("stellarium");
+ *   args.push_back("kstars");
+ *
+ *   SolverRequester sr(sropts);
+ *   sr.install(args);              // implicit conversion to PackageArgs
+ *
+ *   sr.printFeedback(out());
  */
 class SolverRequester
 {
@@ -238,6 +251,14 @@ public:
    */
   void updatePatches();
 
+  /**
+   * Set specified patch for installation.
+   *
+   * \param selected  Selected patch
+   * \return True if the patch was set for installation, false otherwise.
+   */
+  bool installPatch(const zypp::PoolItem & selected);
+
   bool hasFeedback(const Feedback::Id id) const;
   void printFeedback(Out & out) const
   { for_(fb, _feedback.begin(), _feedback.end()) fb->print(out, _opts); }

diff --git a/src/update.cc b/src/update.cc
index 80d9beb..5033609 100755 (executable)
--- a/src/update.cc
+++ b/src/update.cc
@@ -9,6 +9,7 @@
 
 #include "zypp/Patch.h"
 
+#include "SolverRequester.h"
 #include "Table.h"
 #include "update.h"
 #include "main.h"
@@ -474,49 +475,6 @@ void list_updates(Zypper & zypper, const ResKindSet & kinds, bool best_effort)
 
 // ----------------------------------------------------------------------------
 
-static bool
-mark_patch_update(ui::Selectable & s,
-                  bool skip_interactive, bool ignore_affects_pm)
-{
-  Patch::constPtr patch = asKind<Patch>(s.candidateObj());
-  XXX << "candidate patch " << patch->name() << " " << ignore_affects_pm << ", "
-        << patch->restartSuggested() << endl;
-  if (s.isBroken()) // bnc #506860
-  {
-    DBG << "candidate patch " << patch->name() << " " << ignore_affects_pm << ", "
-      << patch->restartSuggested() << endl;
-    if (ignore_affects_pm || patch->restartSuggested())
-    {
-      // #221476
-      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
-        // (i.e. also --non-interactive, since it implies --skip-interactive)
-        Zypper::instance()->out().warning(str::form(
-          // translators: %s is the name of a patch
-          _("'%s' is interactive, skipping."),
-          string(patch->name() + string("-") + patch->edition().asString()).c_str()));
-        return false;
-      }
-      else
-      {
-        bool result = s.setToInstall();
-        if (!result)
-          ERR << "Marking " << s << " for installation failed" << endl;
-        return result;
-      }
-    }
-    else
-      XXX << "patch " << s.name() << "is satisfied or not relevant" << endl;
-  }
-
-  return false;
-}
-
-// ----------------------------------------------------------------------------
-
 void list_patches_by_issue(Zypper & zypper)
 {
   // lp --issues               - list all issues which need to be fixed
@@ -717,6 +675,10 @@ void mark_updates_by_issue(Zypper & zypper)
     for_(i, it->second.begin(), it->second.end())
       issues.insert(pair<string, string>("c", *i));
 
+  SolverRequester::Options sropts;
+  sropts.skip_interactive = zypper.cOpts().count("skip-interactive");
+  sropts.force = zypper.cOpts().count("force");
+
   for_(issue, issues.begin(), issues.end())
   {
     PoolQuery q;
@@ -728,10 +690,13 @@ void mark_updates_by_issue(Zypper & zypper)
     else if (issue->first == "c")
       q.addAttribute(sat::SolvAttr::updateReferenceId, issue->second);
 
+    SolverRequester sr(sropts);
+
     bool found = false;
-    for_(sit, q.begin(), q.end())
-    {
-      if (!PoolItem(*sit).status().isBroken()) // not needed
+    for_(sit, q.begin(), q.end()) // can't use poolItem iterator, since that
+    {                             // does not have matches iterator used below
+      PoolItem pi(*sit);
+      if (!pi.isBroken()) // not needed
         continue;
 
       DBG << "got: " << *sit << endl;
@@ -741,8 +706,7 @@ void mark_updates_by_issue(Zypper & zypper)
         if (issue->first == "b" &&
             d->subFind(sat::SolvAttr::updateReferenceType).asString() == "bugzilla")
         {
-          if (mark_patch_update(*God->pool().proxy().lookup(*sit),
-                zypper.cOpts().count("skip-interactive"), true))
+          if (sr.installPatch(pi))
             found = true;
           else
             DBG << str::form("fix for bugzilla issue number %s was not marked.",
@@ -751,8 +715,7 @@ void mark_updates_by_issue(Zypper & zypper)
         else if (issue->first == "c" &&
             d->subFind(sat::SolvAttr::updateReferenceType).asString() == "cve")
         {
-          if (mark_patch_update(*God->pool().proxy().lookup(*sit),
-                zypper.cOpts().count("skip-interactive"), true))
+          if (sr.installPatch(pi))
             found = true;
           else
             DBG << str::form("fix for CVE issue number %s was not marked.",
@@ -760,6 +723,7 @@ void mark_updates_by_issue(Zypper & zypper)
         }
       }
     }
+    sr.printFeedback(zypper.out());
     if (!found)
     {
       if (issue->first == "b")