Author: jkupec Date: Tue Dec 11 17:30:59 2007 New Revision: 8105 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8105&view=rev Log: - product-info command added for rug compatibility Modified: trunk/zypper/src/zypper-command.cc trunk/zypper/src/zypper-command.h trunk/zypper/src/zypper-info.cc 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=8105&r1=8104&r2=8105&view=diff ============================================================================== --- trunk/zypper/src/zypper-command.cc (original) +++ trunk/zypper/src/zypper-command.cc Tue Dec 11 17:30:59 2007 @@ -45,6 +45,7 @@ const ZypperCommand ZypperCommand::RUG_PATCH_INFO(ZypperCommand::RUG_PATCH_INFO_e); const ZypperCommand ZypperCommand::RUG_PATTERN_INFO(ZypperCommand::RUG_PATTERN_INFO_e); +const ZypperCommand ZypperCommand::RUG_PRODUCT_INFO(ZypperCommand::RUG_PRODUCT_INFO_e); ZypperCommand::ZypperCommand(const std::string & strval_r) @@ -86,6 +87,7 @@ // rug commands doable with zypper commands _table["patch-info"] = ZypperCommand::RUG_PATCH_INFO_e; _table["pattern-info"] = ZypperCommand::RUG_PATTERN_INFO_e; + _table["product-info"] = ZypperCommand::RUG_PRODUCT_INFO_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=8105&r1=8104&r2=8105&view=diff ============================================================================== --- trunk/zypper/src/zypper-command.h (original) +++ trunk/zypper/src/zypper-command.h Tue Dec 11 17:30:59 2007 @@ -42,6 +42,7 @@ //!@{ static const ZypperCommand RUG_PATCH_INFO; static const ZypperCommand RUG_PATTERN_INFO; + static const ZypperCommand RUG_PRODUCT_INFO; //!@} enum Command @@ -74,7 +75,8 @@ NONE_e, RUG_PATCH_INFO_e, - RUG_PATTERN_INFO_e + RUG_PATTERN_INFO_e, + RUG_PRODUCT_INFO_e }; ZypperCommand(Command command) : _command(command) {} Modified: trunk/zypper/src/zypper-info.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-info.cc?rev=8105&r1=8104&r2=8105&view=diff ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/zypper-info.cc Tue Dec 11 17:30:59 2007 @@ -262,8 +262,10 @@ printNVA(pool_item.resolvable()); Product::constPtr product = asKind<Product>(pool_item.resolvable()); - cout << _("Category: ") << product->category() << endl; + cout << _("Category: ") << product->type() << endl; cout << _("Installed: ") << (!ins_pool_item ? "No" : "Yes") << endl; + cout << _("Short Name: ") << product->shortName() << endl; + cout << _("Long Name: ") << product->longName() << endl; printSummaryDesc(pool_item.resolvable()); } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8105&r1=8104&r2=8105&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Dec 11 17:30:59 2007 @@ -1077,12 +1077,12 @@ // rug compatibility command, we have zypper info [-t ] case ZypperCommand::RUG_PATTERN_INFO_e: { - static struct option patch_info_options[] = { + static struct option options[] = { {"catalog", required_argument, 0, 'c'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; - specific_options = patch_info_options; + specific_options = options; _command_help = _( "pattern-info ...\n" "\n" @@ -1093,6 +1093,25 @@ break; } + // rug compatibility command, we have zypper info [-t ] + case ZypperCommand::RUG_PRODUCT_INFO_e: + { + static struct option options[] = { + {"catalog", required_argument, 0, 'c'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + specific_options = options; + _command_help = _( + "product-info ...\n" + "\n" + "Show detailed information for products\n" + "\n" + "This is a rug compatibility alias for 'zypper info -t product'\n" + ); + break; + } + case ZypperCommand::MOO_e: { static struct option moo_options[] = { @@ -2032,7 +2051,8 @@ else if (command() == ZypperCommand::INFO || command() == ZypperCommand::RUG_PATCH_INFO || - command() == ZypperCommand::RUG_PATTERN_INFO) { + command() == ZypperCommand::RUG_PATTERN_INFO || + command() == ZypperCommand::RUG_PRODUCT_INFO) { if (runningHelp()) { cout << _command_help; @@ -2057,6 +2077,9 @@ case ZypperCommand::RUG_PATTERN_INFO_e: kind = ResTraits<Pattern>::kind; break; + case ZypperCommand::RUG_PRODUCT_INFO_e: + kind = ResTraits<Product>::kind; + break; default: case ZypperCommand::INFO_e: // read resolvable type -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org