Author: jkupec Date: Mon Feb 18 11:25:20 2008 New Revision: 8776 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8776&view=rev Log: - extending xmlout support Modified: trunk/zypper/src/output/Out.cc trunk/zypper/src/output/Out.h trunk/zypper/src/output/OutNormal.cc trunk/zypper/src/output/OutNormal.h trunk/zypper/src/output/OutXML.cc trunk/zypper/src/output/OutXML.h trunk/zypper/src/zypper-callbacks.cc trunk/zypper/src/zypper-repo-callbacks.h trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/output/Out.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/output/Out.cc (original) +++ trunk/zypper/src/output/Out.cc Mon Feb 18 11:25:20 2008 @@ -3,4 +3,11 @@ Out::~Out() { -} \ No newline at end of file +} + +bool Out::progressFilter() +{ + if (this->verbosity() < Out::NORMAL) + return true; + return false; +} Modified: trunk/zypper/src/output/Out.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.h?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/output/Out.h (original) +++ trunk/zypper/src/output/Out.h Mon Feb 18 11:25:20 2008 @@ -15,10 +15,14 @@ class Out : private zypp::base::NonCopyable { public: + /** Verbosity levels. */ typedef enum { + /** Only important messages (no progress or status, only the result). */ QUIET = 0, + /** */ NORMAL = 1, + /** More detailed description of the operations. */ HIGH = 2, DEBUG = 3 } Verbosity; @@ -35,19 +39,63 @@ virtual ~Out(); public: + /** + * Show an info message. + * + * \param msg The message to be displayed. + * \param verbosity Minimal level o verbosity in which the message will be + * shown. Out::QUIET means the message will be always be + * displayed. Out::HIGH means the message will be displayed + * only if the current verbosity level is HIGH (-v) or DEBUG + * (-vv). + * \param mask Determines the types of output for which is this message + * intended. By default, the message will be shown in all + * types of output. + */ virtual void info(const std::string & msg, Verbosity verbosity = NORMAL, Type mask = TYPE_ALL) = 0; + + /** + * Show warning. + * + * \param msg The warning message to be displayed. + * \param verbosity Minimal level o verbosity in which the message will be + * shown. Out::QUIET means the message will be always be + * displayed. Out::HIGH means the message will be displayed + * only if the current verbosity level is HIGH (-v) or DEBUG + * (-vv). + * \param mask Determines the types of output for which is this message + * intended. By default, the message will be shown in all + * types of output. + */ virtual void warning(const std::string & msg, Verbosity verbosity = NORMAL, Type mask = TYPE_ALL) = 0; + + /** + * Show an error message and an optional hint. + * + * \param problem_desc + * \param hint + */ virtual void error(const std::string & problem_desc, const std::string & hint = "") = 0; + + /** + * + */ virtual void error(const zypp::Exception & e, const std::string & problem_desc, const std::string & hint = "") = 0; + // virtual void table() // virtual void text() // progress - virtual void progressStart() = 0; - virtual void progress() = 0; - virtual void progressEnd() = 0; + virtual void progressStart(const std::string & id, + const std::string & label, + bool is_tick = false) = 0; + virtual void progress(const std::string & id, + const std::string & label, + int value = -1) = 0; + virtual void progressEnd(const std::string & id, + const std::string & label) = 0; // progress with download rate virtual void dwnldProgressStart() = 0; @@ -70,6 +118,14 @@ */ virtual bool mine(Type type) = 0; + /** + * Determine whether to show progress. + * + * \return <tt>true</tt> if the progress should be filtered out, + * <tt>false</tt> if it should be shown. + */ + virtual bool progressFilter(); + private: Verbosity _verbosity; Type _type; Modified: trunk/zypper/src/output/OutNormal.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.cc (original) +++ trunk/zypper/src/output/OutNormal.cc Mon Feb 18 11:25:20 2008 @@ -1,10 +1,14 @@ #include <iostream> +#include <sstream> #include "OutNormal.h" +#include "../AliveCursor.h" using std::cout; using std::cerr; using std::endl; +using std::string; +using std::ostringstream; OutNormal::~OutNormal() { @@ -45,22 +49,114 @@ void OutNormal::error(const std::string & problem_desc, const std::string & hint) { cerr << problem_desc; - if (!hint.empty()) + if (!hint.empty() && this->verbosity() > Out::QUIET) cerr << endl << hint; cerr << endl; } +// ---------------------------------------------------------------------------- + +string OutNormal::reportZyppException(const zypp::Exception & e) +{ + ostringstream s; + if (e.historySize()) + { + if (this->verbosity() > Out::NORMAL) + { + // print the whole history + s << e.historyAsString(); + // this exception + s << " - " << e.asUserString(); + } + else + // print the root cause only + s << *(--e.historyEnd()); + } + else + s << e.asUserString(); + + return s.str(); +} + +// ---------------------------------------------------------------------------- + void OutNormal::error(const zypp::Exception & e, - const std::string & problem_desc, - const std::string & hint) + const string & problem_desc, + const string & hint) +{ + // problem + cerr << problem_desc << endl; + + // cause + cerr << reportZyppException(e) << endl; + + // hint + if (!hint.empty()) + cerr << hint << endl; +} + +// ---------------------------------------------------------------------------- + +static void display_progress ( const std::string & id, const string & s, int percent) +{ + static AliveCursor cursor; + + if ( percent == 100 ) + cout << CLEARLN << cursor.done() << " " << s; + else + cout << CLEARLN << cursor++ << " " << s; + // dont display percents if invalid + if (percent >= 0 && percent <= 100) + cout << " [" << percent << "%]"; + cout << std::flush; +} + +// ---------------------------------------------------------------------------- + +static void display_tick ( const std::string & id, const string & s) { + static AliveCursor cursor; + + cursor++; + cout << CLEARLN << cursor << " " << s; + cout << std::flush; +} + +// ---------------------------------------------------------------------------- + +void OutNormal::progressStart(const std::string & id, + const std::string & label, + bool is_tick) +{ + if (progressFilter()) + return; + if (is_tick) + display_tick(id, label); + else + display_progress(id, label, 0); } +void OutNormal::progress(const std::string & id, const string & label, int value) +{ + if (progressFilter()) + return; + + if (value) + display_progress(id, label, value); + else + display_tick(id, label); +} + +void OutNormal::progressEnd(const std::string & id, const string& label) +{ + static AliveCursor cursor; + + if (progressFilter()) + return; -void OutNormal::progressStart(){} -void OutNormal::progress(){} -void OutNormal::progressEnd(){} + cout << CLEARLN << cursor.done() << " " << label << std::flush << endl; +} void OutNormal::dwnldProgressStart(){} void OutNormal::dwnldProgress(){} Modified: trunk/zypper/src/output/OutNormal.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.h?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.h (original) +++ trunk/zypper/src/output/OutNormal.h Mon Feb 18 11:25:20 2008 @@ -18,9 +18,13 @@ const std::string & hint = ""); // progress - void progressStart(); - void progress(); - void progressEnd(); + virtual void progressStart(const std::string & id, + const std::string & label, + bool is_tick = false); + virtual void progress(const std::string & id, + const std::string & label, + int value = -1); + virtual void progressEnd(const std::string & id, const std::string & label); // progress with download rate void dwnldProgressStart(); @@ -29,8 +33,10 @@ protected: virtual bool mine(Type type); + private: bool infoWarningFilter(Verbosity verbosity, Type mask); + std::string reportZyppException(const zypp::Exception & e); }; #endif /*OUTNORMAL_H_*/ Modified: trunk/zypper/src/output/OutXML.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.cc (original) +++ trunk/zypper/src/output/OutXML.cc Mon Feb 18 11:25:20 2008 @@ -1,10 +1,12 @@ #include <iostream> +#include <sstream> #include "OutXML.h" using std::cout; using std::endl; - +using std::string; +using std::ostringstream; OutXML::OutXML(Verbosity verbosity) : Out(verbosity) { @@ -34,7 +36,7 @@ return false; } -void OutXML::info(const std::string & msg, Verbosity verbosity, Type mask) +void OutXML::info(const string & msg, Verbosity verbosity, Type mask) { if (infoWarningFilter(verbosity, mask)) return; @@ -42,30 +44,93 @@ cout << "" << msg << "</message>" << endl; } -void OutXML::warning(const std::string & msg, Verbosity verbosity, Type mask) +void OutXML::warning(const string & msg, Verbosity verbosity, Type mask) { if (infoWarningFilter(verbosity, mask)) return; cout << "" << msg << "</message>" << endl; } -void OutXML::error(const std::string & problem_desc, const std::string & hint) +void OutXML::error(const string & problem_desc, const string & hint) { cout << "" << problem_desc << "</message>" << endl; //! \todo hint } +string OutXML::reportZyppException(const zypp::Exception & e) +{ + ostringstream s; + if (e.historySize()) + { + if (this->verbosity() > Out::NORMAL) + { + // print the whole history + s << e.historyAsString(); + // this exception + s << " - " << e.asUserString(); + } + else + // print the root cause only + s << *(--e.historyEnd()); + } + else + s << e.asUserString(); + + return s.str(); +} + + void OutXML::error(const zypp::Exception & e, - const std::string & problem_desc, - const std::string & hint) + const string & problem_desc, + const string & hint) +{ + ostringstream s; + + // problem + s << problem_desc << endl; + // cause + s << reportZyppException(e) << endl; + // hint + if (!hint.empty()) + s << hint << endl; + + cout << "" << s.str() << "</message>" << endl; +} + +void OutXML::progressStart(const string & id, + const string & label, + bool is_tick) { - + if (progressFilter()) + return; + + cout << ""; + cout << endl; } +void OutXML::progress(const string & id, + const string& label, + int value) +{ + if (progressFilter()) + return; + + if (value) + cout << "" << endl; + else + cout << "<tick/>" << endl; +} + +void OutXML::progressEnd(const string & id, const string& label) +{ + if (progressFilter()) + return; + + cout << "</progress>" << endl; +} -void OutXML::progressStart(){} -void OutXML::progress(){} -void OutXML::progressEnd(){} void OutXML::dwnldProgressStart(){} void OutXML::dwnldProgress(){} Modified: trunk/zypper/src/output/OutXML.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.h?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/output/OutXML.h (original) +++ trunk/zypper/src/output/OutXML.h Mon Feb 18 11:25:20 2008 @@ -18,9 +18,13 @@ const std::string & hint = ""); // progress - void progressStart(); - void progress(); - void progressEnd(); + virtual void progressStart(const std::string & id, + const std::string & label, + bool is_tick = false); + virtual void progress(const std::string & id, + const std::string & label, + int value = -1); + virtual void progressEnd(const std::string & id, const std::string & label); // progress with download rate void dwnldProgressStart(); @@ -29,8 +33,10 @@ protected: virtual bool mine(Type type); + private: bool infoWarningFilter(Verbosity verbosity, Type mask); + std::string reportZyppException(const zypp::Exception & e); }; #endif /*OUTXML_H_*/ Modified: trunk/zypper/src/zypper-callbacks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/zypper-callbacks.cc (original) +++ trunk/zypper/src/zypper-callbacks.cc Mon Feb 18 11:25:20 2008 @@ -4,6 +4,7 @@ #include #include "zypp/base/Logger.h" +#include "zypp/base/Deprecated.h" #include "zypp/Resolvable.h" #include "AliveCursor.h" @@ -13,7 +14,7 @@ using namespace std; using namespace boost; -void display_progress ( const std::string &id, ostream & out, const string& s, int percent) { +ZYPP_DEPRECATED void display_progress ( const std::string &id, ostream & out, const string& s, int percent) { static AliveCursor cursor; if (Zypper::instance()->globalOpts().machine_readable) @@ -34,7 +35,7 @@ // ---------------------------------------------------------------------------- -void display_tick ( const std::string &id, ostream & out, const string& s) { +ZYPP_DEPRECATED void display_tick ( const std::string &id, ostream & out, const string& s) { static AliveCursor cursor; if (Zypper::instance()->globalOpts().machine_readable) @@ -50,7 +51,7 @@ // ---------------------------------------------------------------------------- -void display_done ( const std::string &id, ostream & out, const string& s) { +ZYPP_DEPRECATED void display_done ( const std::string &id, ostream & out, const string& s) { static AliveCursor cursor; if (Zypper::instance()->globalOpts().machine_readable) @@ -66,7 +67,7 @@ // ---------------------------------------------------------------------------- -void display_done (const std::string &id, ostream & out) { +ZYPP_DEPRECATED void display_done (const std::string &id, ostream & out) { if (Zypper::instance()->globalOpts().machine_readable) { @@ -182,7 +183,7 @@ // ---------------------------------------------------------------------------- -void report_zypp_exception(const zypp::Exception & e) +ZYPP_DEPRECATED void report_zypp_exception(const zypp::Exception & e) { if (e.historySize()) { @@ -204,7 +205,7 @@ // ---------------------------------------------------------------------------- -void report_problem(const zypp::Exception & e, +ZYPP_DEPRECATED void report_problem(const zypp::Exception & e, const string & problem_desc, const string & hint) { @@ -224,9 +225,9 @@ void report_too_many_arguments(const string & specific_help) { //! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information." - cerr << _("Too many arguments") << '.' << endl; - cout_n << _("Usage") << ':' << endl; - cout_n << specific_help; + ostringstream s; + s << _("Usage") << ':' << endl << specific_help; + Zypper::instance()->out().error(_("Too many arguments."), s.str()); } // Local Variables: Modified: trunk/zypper/src/zypper-repo-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repo-callbacks.h?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/zypper-repo-callbacks.h (original) +++ trunk/zypper/src/zypper-repo-callbacks.h Mon Feb 18 11:25:20 2008 @@ -216,22 +216,24 @@ struct ProgressReportReceiver : public zypp::callback::ReceiveReportzypp::ProgressReport { - void tick( const zypp::ProgressData &data ) - { - if ( data.reportAlive() ) - display_tick (zypp::str::numstring(data.numericId()), cout_n, data.name() ); - else - display_progress ( zypp::str::numstring(data.numericId()), cout_n, data.name() , data.val() ); - } - virtual void start( const zypp::ProgressData &data ) { - tick(data); + Zypper::instance()->out().progressStart( + zypp::str::numstring(data.numericId()), + data.name(), + data.reportAlive()); } virtual bool progress( const zypp::ProgressData &data ) { - tick(data); + if (data.reportAlive()) + Zypper::instance()->out().progress( + zypp::str::numstring(data.numericId()), + data.name()); + else + Zypper::instance()->out().progress( + zypp::str::numstring(data.numericId()), + data.name(), data.val()); return true; } @@ -244,7 +246,9 @@ virtual void finish( const zypp::ProgressData &data ) { - display_done(zypp::str::numstring(data.numericId()), cout_n, data.name() ); + Zypper::instance()->out().progressEnd( + zypp::str::numstring(data.numericId()), + data.name()); } }; @@ -254,36 +258,43 @@ virtual void start(const zypp::ProgressData & pd, const zypp::RepoInfo repo) { _repo = repo; - - display_step(pd); + Zypper::instance()->out() + .progressStart("repo", "(" + _repo.name() + ") " + pd.name()); + //display_step(pd); } - +/* void display_step(const zypp::ProgressData & pd) { display_progress("repo", cout_n, "(" + _repo.name() + ") " + pd.name(), pd.val()); } - +*/ virtual bool progress(const zypp::ProgressData & pd) { - display_step(pd); + Zypper::instance()->out() + .progress("repo", "(" + _repo.name() + ") " + pd.name(), pd.val()); +// display_step(pd); return true; } virtual Action problem( zypp::Repository /*repo*/, Error error, const std::string & description ) { - display_done ("repo", cout_n); + Zypper::instance()->out() + .progressEnd("repo", "(" + _repo.name() + ") "); +// display_done ("repo", cout_n); display_error (error, description); return (Action) read_action_ari (ABORT); } virtual void finish( zypp::Repository /*repo*/, const std::string & task, Error error, const std::string & reason ) { - display_step(100); + Zypper::instance()->out() + .progressEnd("repo", "(" + _repo.name() + ") "); +// display_step(100); // many of these, avoid newline if (boost::algorithm::starts_with (task, "Reading patch")) cout_n << '\r' << flush; - else - display_done ("repo", cout_n); +// else +// display_done ("repo", cout_n); display_error (error, reason); } Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Mon Feb 18 11:25:20 2008 @@ -15,6 +15,7 @@ #include "zypp/media/MediaException.h" #include "zypper.h" +#include "output/Out.h" #include "zypper-main.h" #include "zypper-getopt.h" #include "zypper-tabulator.h" @@ -46,7 +47,7 @@ // ---------------------------------------------------------------------------- -static bool refresh_raw_metadata(const Zypper & zypper, +static bool refresh_raw_metadata(Zypper & zypper, const RepoInfo & repo, bool force_download) { @@ -63,9 +64,9 @@ { // check whether libzypp indicates a refresh is needed, and if so, // print a message - cout_v << format( - _("Checking whether to refresh metadata for %s")) % repo.name() - << endl; + zypper.out().info(boost::str(format( + _("Checking whether to refresh metadata for %s")) % repo.name()), + Out::HIGH); for(RepoInfo::urls_const_iterator it = repo.baseUrlsBegin(); it != repo.baseUrlsEnd(); ++it) { @@ -73,15 +74,17 @@ { if (manager.checkIfToRefreshMetadata(repo, *it)) { - cout_n << format(_("Refreshing '%s'")) % repo.name(); + ostringstream s; + s << format(_("Refreshing '%s'")) % repo.name(); if (zypper.command() == ZypperCommand::REFRESH && zypper.cOpts().count("force")) - cout_n << " " << _("(forced)"); - cout_n << endl; + s << " " << _("(forced)"); + zypper.out().info(s.str(), Out::HIGH); } else if (zypper.command() == ZypperCommand::REFRESH) { - cout_n << format(_("Repository '%s' is up to date.")) % repo.name() << endl; + zypper.out().info(boost::str( + format(_("Repository '%s' is up to date.")) % repo.name())); } break; // don't check all the urls, just the first succussfull. } @@ -93,14 +96,14 @@ } } else - cout << _("Forcing raw metadata refresh") << endl; + zypper.out().info(_("Forcing raw metadata refresh")); manager.refreshMetadata(repo, force_download ? RepoManager::RefreshForced : RepoManager::RefreshIfNeeded); } catch (const MediaException & e) { - report_problem(e, + zypper.out().error(e, boost::str(format(_("Problem downloading files from '%s'.")) % repo.name()), _("Please see the above error message to for a hint.")); @@ -109,27 +112,27 @@ catch (const RepoNoUrlException & e) { ZYPP_CAUGHT(e); - cerr << format(_("No URLs defined for '%s'.")) % repo.name() << endl; + zypper.out().error(boost::str( + format(_("No URLs defined for '%s'.")) % repo.name())); if (!repo.filepath().empty()) - cerr << format( + zypper.out().info(boost::str(format( // TranslatorExplanation the first %s is a .repo file path _("Please add one or more base URL (baseurl=URL) entries to %s for repository '%s'.")) - % repo.filepath() % repo.name() << endl; + % repo.filepath() % repo.name())); return true; // error } catch (const RepoNoAliasException & e) { ZYPP_CAUGHT(e); - //! \todo correct the message after 10.3 release - cerr << format(_("No alias defined this repository.")) << endl; - report_a_bug(cerr); + zypper.out().error(_("No alias defined for this repository.")); + report_a_bug(zypper.out()); return true; // error } catch (const RepoException & e) { ZYPP_CAUGHT(e); - report_problem(e, + zypper.out().error(e, boost::str(format(_("Repository '%s' is invalid.")) % repo.name()), _("Please check if the URLs defined for this repository are pointing to a valid repository.")); @@ -138,7 +141,7 @@ catch (const Exception &e) { ZYPP_CAUGHT(e); - report_problem(e, + zypper.out().error(e, boost::str(format(_("Error downloading metadata for '%s':")) % repo.name())); // log untranslated message ERR << format("Error reading repository '%s':") % repo.name() << endl; @@ -166,7 +169,7 @@ static bool build_cache(Zypper & zypper, const RepoInfo &repo, bool force_build) { if (force_build) - cout << _("Forcing building of repository cache") << endl; + zypper.out().info(_("Forcing building of repository cache")); try { @@ -178,7 +181,7 @@ { ZYPP_CAUGHT(e); - report_problem(e, + zypper.out().error(e, boost::str(format(_("Error parsing metadata for '%s':")) % repo.name()), // TranslatorExplanation Don't translate the URL unless it is translated, too _("This may be caused by invalid metadata in the repository," @@ -194,7 +197,7 @@ catch (const repo::RepoMetadataException & e) { ZYPP_CAUGHT(e); - report_problem(e, + zypper.out().error(e, boost::str(format(_("Repository metadata for '%s' not found in local cache.")) % repo.name())); // this should not happend and is probably a bug, rethrowing ZYPP_RETHROW(e); @@ -202,7 +205,7 @@ catch (const Exception &e) { ZYPP_CAUGHT(e); - report_problem(e, + zypper.out().error(e, _("Error building the cache database:")); // log untranslated message ERR << "Error writing to cache db" << endl; @@ -669,11 +672,12 @@ get_repos(zypper, tmp1->second.begin(), tmp1->second.end(), specified, not_found); report_unknown_repos(not_found); - cout_v << _("Specified repositories: "); + ostringstream s; + s << _("Specified repositories: "); for (list<RepoInfo>::const_iterator it = specified.begin(); it != specified.end(); ++it) - cout_v << it->alias() << " "; - cout_v << endl; + s << it->alias() << " "; + zypper.out().info(s.str(), Out::HIGH); unsigned error_count = 0; unsigned enabled_repo_count = repos.size(); @@ -712,9 +716,9 @@ format(_("Skipping disabled repository '%s'")) % repo.name()); if (specified.empty()) - cout_v << msg << endl; + zypper.out().info(msg, Out::HIGH); else - cerr << msg << endl; + zypper.out().error(msg); enabled_repo_count--; continue; @@ -757,8 +761,9 @@ if (error) { - cerr << format(_("Skipping repository '%s' because of the above error.")) - % repo.name() << endl; + zypper.out().error(boost::str(format( + _("Skipping repository '%s' because of the above error.")) + % repo.name())); ERR << format("Skipping repository '%s' because of the above error.") % repo.name() << endl; error_count++; @@ -771,31 +776,29 @@ // print the result message if (enabled_repo_count == 0) { + string hint = + _("Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."); if (!specified.empty() || !not_found.empty()) - cerr << _("Specified repositories are not enabled or defined."); + zypper.out().error(_("Specified repositories are not enabled or defined."), hint); else - cerr << _("There are no enabled repositories defined."); - - cout_n << endl - << _("Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories.") - << endl; + zypper.out().error(_("There are no enabled repositories defined."), hint); } else if (error_count == enabled_repo_count) { - cerr << _("Could not refresh the repositories because of errors.") << endl; + zypper.out().error(_("Could not refresh the repositories because of errors.")); zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); return; } else if (error_count) { - cerr << _("Some of the repositories have not been refreshed because of an error.") << endl; + zypper.out().error(_("Some of the repositories have not been refreshed because of an error.")); zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); return; } else if (!specified.empty()) - cout << _("Specified repositories have been refreshed.") << endl; + zypper.out().info(_("Specified repositories have been refreshed.")); else - cout << _("All repositories have been refreshed.") << endl; + zypper.out().info(_("All repositories have been refreshed.")); } // ---------------------------------------------------------------------------- Modified: trunk/zypper/src/zypper-utils.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/zypper-utils.cc Mon Feb 18 11:25:20 2008 @@ -1,4 +1,5 @@ #include <fstream> +#include <sstream> #include #include #include @@ -45,12 +46,14 @@ /// tell the user to report a bug, and how // (multiline, with endls) -ostream& report_a_bug (ostream& stm) +void report_a_bug (Out & out) { - return stm << _("Please file a bug report about this.") << endl - // TranslatorExplanation remember not to translate the URL - // unless you translate the actual page :) - << _("See http://en.opensuse.org/Zypper#Troubleshooting for instructions.") << endl; + ostringstream s; + s <<_("Please file a bug report about this.") << endl + // TranslatorExplanation remember not to translate the URL + // unless you translate the actual page :) + << _("See http://en.opensuse.org/Zypper#Troubleshooting for instructions."); + out.error(s.str()); } // ---------------------------------------------------------------------------- Modified: trunk/zypper/src/zypper-utils.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.h?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/zypper-utils.h (original) +++ trunk/zypper/src/zypper-utils.h Mon Feb 18 11:25:20 2008 @@ -8,12 +8,14 @@ #include "zypp/Resolvable.h" #include "zypp/Pathname.h" +#include "output/Out.h" + std::string readline_getline(); /** * Write a suggestion to report a bug to the specified stream. */ -std::ostream & report_a_bug (std::ostream& stm); +void report_a_bug (Out & out); bool is_changeable_media(const zypp::Url & url); Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8776&r1=8775&r2=8776&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Feb 18 11:25:20 2008 @@ -668,7 +668,7 @@ s << ex.asUserString(); out().error(s.str()); - report_a_bug(cerr); + report_a_bug(out()); } } @@ -1362,7 +1362,7 @@ ERR << "Unknown or unexpected command" << endl; out().error(_("Unexpected program flow.")); - report_a_bug(cerr); + report_a_bug(out()); } } @@ -1622,7 +1622,7 @@ else if (command() == ZypperCommand::RENAME_REPO) { - if (runningHelp()) { out().info(_command_help), Out::QUIET; return; } + if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } // check root user if (geteuid() != 0) @@ -1727,7 +1727,7 @@ else if (command() == ZypperCommand::CLEAN) { - if (runningHelp()) { out().info(_command_help), Out::QUIET; return; } + if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } // check root user if (geteuid() != 0) @@ -2418,7 +2418,7 @@ else { out().error(_("Unexpected program flow.")); - report_a_bug(cerr); + report_a_bug(out()); } return; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org