Author: jkupec Date: Thu Jan 31 13:41:40 2008 New Revision: 8421 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8421&view=rev Log: - fixed shell -h in zypper shell Modified: trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8421&r1=8420&r2=8421&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Jan 31 13:41:40 2008 @@ -515,8 +515,6 @@ setCommand(ZypperCommand(command_str)); if (command() == ZypperCommand::SHELL_QUIT) break; - else if (command() == ZypperCommand::SHELL) - cout << _("You already are running zypper's shell.") << endl; else if (command() == ZypperCommand::NONE) print_unknown_command_hint(*this); else @@ -2301,11 +2299,15 @@ else if (command() == ZypperCommand::SHELL) { - if (!runningHelp()) - WAR << "this command should not be reached when not running help." - " Printing the help anyway." << endl; - - cout << _command_help; + if (runningHelp()) + cout << _command_help; + else if (runningShell()) + cout << _("You already are running zypper's shell.") << endl; + else + { + cerr << _("Unexpected program flow") << "." << endl; + report_a_bug(cerr); + } return; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org