Author: jkupec Date: Sun Apr 27 14:30:13 2008 New Revision: 9839 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9839&view=rev Log: - comments Modified: trunk/zypper/src/output/Out.h trunk/zypper/src/output/xmlout.rnc trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/output/Out.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.h?rev=9839&r1=9838&r2=9839&view=diff ============================================================================== --- trunk/zypper/src/output/Out.h (original) +++ trunk/zypper/src/output/Out.h Sun Apr 27 14:30:13 2008 @@ -225,7 +225,11 @@ const std::string & prompt, const PromptOptions & poptions, const std::string & startdesc = "") = 0; - + + /** + * Print help for prompt, if available. + * This method should be called after '?' prompt option has been entered. + */ virtual void promptHelp(const PromptOptions & poptions) = 0; public: Modified: trunk/zypper/src/output/xmlout.rnc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/xmlout.rnc?rev=9839&r1=9838&r2=9839&view=diff ============================================================================== --- trunk/zypper/src/output/xmlout.rnc (original) +++ trunk/zypper/src/output/xmlout.rnc Sun Apr 27 14:30:13 2008 @@ -66,7 +66,8 @@ element text { text }, element option { attribute default { xsd:boolean }?, - attribute value { xsd:string } + attribute value { xsd:string }, + attribute desc { xsd:string }? }* } Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=9839&r1=9838&r2=9839&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Apr 27 14:30:13 2008 @@ -2184,8 +2184,8 @@ return; } } - - + + // returns SUMMARY_* int retv = summary(zypper); if (retv != SUMMARY_NOTHING_TO_DO || !zypper.runtimeData().srcpkgs_to_install.empty()) @@ -2208,19 +2208,22 @@ // after install/update command summary if there will be any package // to-be-removed automatically to show why, if asked. popts.setOptions(_("y/n/p"), 0); + // translators: help text for 'y' option in the y/n/p prompt popts.setOptionHelp(0, _("Accept the summary and proceed with installation/removal of packages.")); + // translators: help text for 'n' option in the y/n/p prompt popts.setOptionHelp(1, _("Cancel the operation.")); + // translators: help text for 'p' option in the y/n/p prompt popts.setOptionHelp(2, _("Restart solver in no-force-resolution mode in order to show dependency problems.")); - // translators: Translate 'p' to whathever you translated it in the y/n/p prompt text. string prompt_text = _("Continue?"); zypper.out().prompt(PROMPT_YN_INST_REMOVE_CONTINUE, prompt_text, popts); unsigned int reply = get_prompt_reply(zypper, PROMPT_YN_INST_REMOVE_CONTINUE, popts); - + if (reply == 2) { // one more solver solver run with force-resoltion off zypper.runtimeData().force_resolution = false; + // undo solver changes before retrying God->resolver()->undo(); continue; } @@ -2270,12 +2273,12 @@ commit_done = true; } - - + + MIL << endl << "DONE" << endl; - + gData.show_media_progress_hack = false; - + if (!result._errors.empty()) retv = ZYPPER_EXIT_ERR_ZYPP; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org