- removed deprecated 'xu', replaced by

  zypper --xmlout install -t package -t patch

diff --git a/src/Command.cc b/src/Command.cc
index 7e33e29..f584c51 100644 (file)
--- a/src/Command.cc
+++ b/src/Command.cc
@@ -42,7 +42,6 @@ const ZypperCommand ZypperCommand::PRODUCTS(ZypperCommand::PRODUCTS_e);
 const ZypperCommand ZypperCommand::WHAT_PROVIDES(ZypperCommand::WHAT_PROVIDES_e);
 //const ZypperCommand ZypperCommand::WHAT_REQUIRES(ZypperCommand::WHAT_REQUIRES_e);
 //const ZypperCommand ZypperCommand::WHAT_CONFLICTS(ZypperCommand::WHAT_CONFLICTS_e);
-const ZypperCommand ZypperCommand::XML_LIST_UPDATES_PATCHES(ZypperCommand::XML_LIST_UPDATES_PATCHES_e);
 
 const ZypperCommand ZypperCommand::ADD_LOCK(ZypperCommand::ADD_LOCK_e);
 const ZypperCommand ZypperCommand::REMOVE_LOCK(ZypperCommand::REMOVE_LOCK_e);
@@ -105,7 +104,6 @@ ZypperCommand::Command ZypperCommand::parse(const std::string & strval_r)
     _table["what-provides"] = _table["wp"] = ZypperCommand::WHAT_PROVIDES_e;
     //_table["what-requires"] = _table["wr"] = ZypperCommand::WHAT_REQUIRES_e;
     //_table["what-conflicts"] = _table["wc"] = ZypperCommand::WHAT_CONFLICTS_e;
-    _table["xml-updates"] = _table["xu"] = ZypperCommand::XML_LIST_UPDATES_PATCHES_e;
 
     _table["addlock"] = _table["al"] = _table["lock-add"] = _table["la"] = ZypperCommand::ADD_LOCK_e;
     _table["removelock"] = _table["rl"] = _table["lock-delete"] = _table["ld"] = ZypperCommand::REMOVE_LOCK_e;

diff --git a/src/Command.h b/src/Command.h
index 5bacb9d..0310bbe 100644 (file)
--- a/src/Command.h
+++ b/src/Command.h
@@ -37,7 +37,6 @@ struct ZypperCommand
   static const ZypperCommand WHAT_PROVIDES;
   //static const ZypperCommand WHAT_REQUIRES;
   //static const ZypperCommand WHAT_CONFLICTS;
-  static const ZypperCommand XML_LIST_UPDATES_PATCHES;
 
   static const ZypperCommand ADD_LOCK;
   static const ZypperCommand REMOVE_LOCK;
@@ -96,7 +95,6 @@ struct ZypperCommand
     WHAT_PROVIDES_e,
     //WHAT_REQUIRES_e,
     //WHAT_CONFLICTS_e,
-    XML_LIST_UPDATES_PATCHES_e,
 
     ADD_LOCK_e,
     REMOVE_LOCK_e,

diff --git a/src/Zypper.cc b/src/Zypper.cc
index bca2664..8d0d116 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -1637,26 +1637,6 @@ void Zypper::processCommandOptions()
     break;
   }
 
-  case ZypperCommand::XML_LIST_UPDATES_PATCHES_e:
-  {
-    static struct option xml_updates_options[] = {
-      {"repo", required_argument, 0, 'r'},
-      {"help", no_argument, 0, 'h'},
-      {0, 0, 0, 0}
-    };
-    specific_options = xml_updates_options;
-    _command_help = str::form(_(
-      "xml-updates\n"
-      "\n"
-      "Show updates and patches in xml format. This command is deprecated and will"
-      " eventually be dropped in favor of '%s'.\n"
-      "\n"
-      "  Command options:\n"
-      "-r, --repo <alias|#|URI>  Work only with updates from the specified repository.\n"
-    ), "zypper --xmlout install -t package -t patch");
-    break;
-  }
-
   case ZypperCommand::ADD_LOCK_e:
   {
     static struct option options[] =
@@ -2889,32 +2869,6 @@ void Zypper::doCommand()
     break;
   }
 
-  // -----------------( xml list updates and patches )------------------------
-
-  //! \todo remove this command
-  case ZypperCommand::XML_LIST_UPDATES_PATCHES_e:
-  {
-    if (runningHelp()) { out().info(_command_help, Out::QUIET); return; }
-
-    init_target(*this);
-    init_repos(*this);
-    if (exitCode() != ZYPPER_EXIT_OK)
-      return;
-    load_resolvables(*this);
-    // needed to compute status of PPP
-    resolve(*this);
-
-    cout << "<update-status version=\"0.6\">" << endl;
-    cout << "<update-list>" << endl;
-    ResKindSet kinds; kinds.insert(ResTraits<Package>::kind);
-    if (!xml_list_patches ())  // Only list updates if no
-      xml_list_updates (kinds);        // affects-pkg-mgr patches are available
-    cout << "</update-list>" << endl;
-    cout << "</update-status>" << endl;
-
-    break;
-  }
-
   // -----------------------------( update )----------------------------------
 
   case ZypperCommand::UPDATE_e: