Author: jkupec Date: Mon Apr 21 11:23:29 2008 New Revision: 9748 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9748&view=rev Log: - rug's list-resolvables added (hardcoded list of resolvable types) (fate #302148) Modified: trunk/zypper/src/zypper-command.cc trunk/zypper/src/zypper-command.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-command.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-command.cc?rev=9748&r1=9747&r2=9748&view=diff ============================================================================== --- trunk/zypper/src/zypper-command.cc (original) +++ trunk/zypper/src/zypper-command.cc Mon Apr 21 11:23:29 2008 @@ -58,7 +58,14 @@ const ZypperCommand ZypperCommand::RUG_PATTERN_INFO(ZypperCommand::RUG_PATTERN_INFO_e); const ZypperCommand ZypperCommand::RUG_PRODUCT_INFO(ZypperCommand::RUG_PRODUCT_INFO_e); const ZypperCommand ZypperCommand::RUG_SERVICE_TYPES(ZypperCommand::RUG_SERVICE_TYPES_e); +const ZypperCommand ZypperCommand::RUG_LIST_RESOLVABLES(ZypperCommand::RUG_LIST_RESOLVABLES_e); const ZypperCommand ZypperCommand::RUG_MOUNT(ZypperCommand::RUG_MOUNT_e); +const ZypperCommand ZypperCommand::RUG_INFO_PROVIDES(ZypperCommand::RUG_INFO_PROVIDES_e); +const ZypperCommand ZypperCommand::RUG_INFO_CONFLICTS(ZypperCommand::RUG_INFO_CONFLICTS_e); +const ZypperCommand ZypperCommand::RUG_INFO_OBSOLETES(ZypperCommand::RUG_INFO_OBSOLETES_e); +const ZypperCommand ZypperCommand::RUG_INFO_REQUIREMENTS(ZypperCommand::RUG_INFO_REQUIREMENTS_e); +const ZypperCommand ZypperCommand::RUG_PATCH_SEARCH(ZypperCommand::RUG_PATCH_SEARCH_e); + ZypperCommand::ZypperCommand(const std::string & strval_r) : _command(parse(strval_r)) @@ -113,7 +120,13 @@ _table["pattern-info"] = ZypperCommand::RUG_PATTERN_INFO_e; _table["product-info"] = ZypperCommand::RUG_PRODUCT_INFO_e; _table["service-types"] = _table["st"] = ZypperCommand::RUG_SERVICE_TYPES_e; + _table["list-resolvables"] = /*_table["lr"] CONFLICT with repos =*/ ZypperCommand::RUG_LIST_RESOLVABLES_e; _table["mount"] = ZypperCommand::RUG_MOUNT_e; + _table["info-provides"] = _table["ip"] = ZypperCommand::RUG_INFO_PROVIDES_e; + _table["info-requirements"] = _table["ir"] = ZypperCommand::RUG_INFO_REQUIREMENTS_e; + _table["info-conflicts"] = _table["ic"] = ZypperCommand::RUG_INFO_CONFLICTS_e; + _table["info-obsoletes"] = _table["io"] = ZypperCommand::RUG_INFO_OBSOLETES_e; + _table["patch-search"] = _table["pse"] = ZypperCommand::RUG_PATCH_SEARCH_e; } std::mapstd::string,ZypperCommand::Command::const_iterator it Modified: trunk/zypper/src/zypper-command.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-command.h?rev=9748&r1=9747&r2=9748&view=diff ============================================================================== --- trunk/zypper/src/zypper-command.h (original) +++ trunk/zypper/src/zypper-command.h Mon Apr 21 11:23:29 2008 @@ -56,7 +56,13 @@ static const ZypperCommand RUG_PATTERN_INFO; static const ZypperCommand RUG_PRODUCT_INFO; static const ZypperCommand RUG_SERVICE_TYPES; + static const ZypperCommand RUG_LIST_RESOLVABLES; static const ZypperCommand RUG_MOUNT; + static const ZypperCommand RUG_INFO_PROVIDES; + static const ZypperCommand RUG_INFO_CONFLICTS; + static const ZypperCommand RUG_INFO_OBSOLETES; + static const ZypperCommand RUG_INFO_REQUIREMENTS; + static const ZypperCommand RUG_PATCH_SEARCH; //!@} enum Command @@ -104,7 +110,13 @@ RUG_PATTERN_INFO_e, RUG_PRODUCT_INFO_e, RUG_SERVICE_TYPES_e, - RUG_MOUNT_e + RUG_LIST_RESOLVABLES_e, + RUG_MOUNT_e, + RUG_INFO_PROVIDES_e, + RUG_INFO_CONFLICTS_e, + RUG_INFO_OBSOLETES_e, + RUG_INFO_REQUIREMENTS_e, + RUG_PATCH_SEARCH_e }; ZypperCommand(Command command) : _command(command) {} Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9748&r1=9747&r2=9748&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Apr 21 11:23:29 2008 @@ -56,6 +56,8 @@ RuntimeData gData; parsed_opts copts; // command options +static void rug_list_resolvables(Zypper & zypper); + Zypper::Zypper() : _argc(0), _argv(NULL), _out_ptr(NULL), _command(ZypperCommand::NONE), @@ -980,6 +982,24 @@ {0, 0, 0, 0} }; specific_options = service_list_options; + + // handle the conflicting rug's lr here: + if (_gopts.is_rug_compatible) + { + static struct option options[] = { + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + specific_options = options; + + _command_help = _( + "list-resolvables (lr)\n" + "\n" + "List available resolvable types.\n" + ); + break; + } + _command_help = _( "repos (lr)\n" "\n" @@ -1702,6 +1722,21 @@ break; } + case ZypperCommand::RUG_LIST_RESOLVABLES_e: + { + static struct option options[] = { + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + specific_options = options; + _command_help = _( + "list-resolvables (lr)\n" + "\n" + "List available resolvable types.\n" + ); + break; + } + case ZypperCommand::RUG_MOUNT_e: { static struct option options[] = { @@ -1820,9 +1855,12 @@ case ZypperCommand::LIST_REPOS_e: { if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } - // if (runningHelp()) display_command_help() - list_repos(*this); + if (_gopts.is_rug_compatible) + rug_list_resolvables(*this); + else + list_repos(*this); + break; } @@ -3028,6 +3066,13 @@ break; } + case ZypperCommand::RUG_LIST_RESOLVABLES_e: + { + if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } + rug_list_resolvables(*this); + break; + } + default: // if the program reaches this line, something went wrong setExitCode(ZYPPER_EXIT_ERR_BUG); @@ -3058,6 +3103,23 @@ } } +void rug_list_resolvables(Zypper & zypper) +{ + Table t; + + TableHeader th; + th << _("Resolvable Type"); + t << th; + + { TableRow tr; tr << "package"; t << tr; } + { TableRow tr; tr << "patch"; t << tr; } + { TableRow tr; tr << "pattern"; t << tr; } + { TableRow tr; tr << "product"; t << tr; } + + cout << t; +} + + // Local Variables: // c-basic-offset: 2 // End: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org