- fix #309267, reinstalling installed resolvables

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index 1a7d21d..97078fd 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -273,15 +273,27 @@ void mark_for_install( const ResObject::Kind &kind,
 
   if (installer.installed_item &&
       installer.installed_item.resolvable()->edition() == installer.item.resolvable()->edition() &&
-      installer.installed_item.resolvable()->arch() == installer.item.resolvable()->arch()) {
+      installer.installed_item.resolvable()->arch() == installer.item.resolvable()->arch() &&
+      ( ! copts.count("force") ) )
+  {
+    // if it is needed install anyway, even if it is installed
+    if ( installer.item.status().isNeeded() )
+    {
+      installer.item.status().setTransact( true, zypp::ResStatus::USER );
+    }
+    
     cout_n << format(_("skipping %s '%s' (already installed)")) % kind_to_string_localized(kind,1) % name << endl;
   }
   else {
+    
     // TODO don't use setToBeInstalled for this purpose but higher level solver API
     bool result = installer.item.status().setToBeInstalled( zypp::ResStatus::USER );
-    if (!result) {
-      cerr << format(_("Failed to add '%s' to the list of packages to be installed.")) % name << endl;
-      ERR << "Could not set " << name << " as to-be-installed" << endl;
+    if (!result)
+    {
+      // this is because the resolvable is installed and we are forcing.
+      installer.item.status().setTransact( true, zypp::ResStatus::USER );
+      //cerr << format(_("Failed to add '%s' to the list of packages to be installed.")) % name << endl;
+      //ERR << "Could not set " << name << " as to-be-installed" << endl;
     }
   }
 }

diff --git a/src/zypper.cc b/src/zypper.cc
index ecbff29..71bf4ca 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -277,6 +277,7 @@ int one_command(int argc, char **argv)
       {"type",                      required_argument, 0, 't'},
       // the default (ignored)
       {"name",                      no_argument,       0, 'n'},
+      {"force",                     no_argument,       0, 'f'},
       {"capability",                no_argument,       0, 'C'},
       // rug compatibility, we have global --non-interactive
       {"no-confirm",                no_argument,       0, 'y'}, 
@@ -302,6 +303,7 @@ int one_command(int argc, char **argv)
       "-r, --repo <alias>              Install resolvables only from repository specified by alias.\n"
       "-t, --type <type>               Type of resolvable (package, patch, pattern, product) (default: package)\n"
       "-n, --name                      Select resolvables by plain name, not by capability\n"
+      "-f, --force                     Install even if the item is already installed (reinstall)\n"
       "-l, --auto-agree-with-licenses  Automatically say 'yes' to third party license confirmation prompt.\n"
       "                                See 'man zypper' for more details.\n"
       "    --debug-solver              Create solver test case for debugging\n"
@@ -1077,6 +1079,8 @@ int one_command(int argc, char **argv)
         gSettings.license_auto_agree = true;
     }
 
+    
+    
     if (command == ZypperCommand::REMOVE) {
       if (ghelp || arguments.size() < 1) {
         cerr << specific_help;