Author: jkupec Date: Mon Sep 3 14:15:45 2007 New Revision: 7086 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7086&view=rev Log: - removing rpm message improved (#307132) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-rpm-callbacks.h Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=7086&r1=7085&r2=7086&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Mon Sep 3 14:15:45 2007 @@ -746,8 +746,11 @@ cout << endl; - cout_n << format(_("Overall download size: %s.")) % download_size; - cout_n << " "; + if (download_size > 0) + { + cout_n << format(_("Overall download size: %s.")) % download_size; + cout_n << " "; + } if (new_installed_size > 0) // TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K cout_n << format(_("After the operation, additional %s will be used.")) Modified: trunk/zypper/src/zypper-rpm-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-rpm-callbacks.h?rev=7086&r1=7085&r2=7086&view=diff ============================================================================== --- trunk/zypper/src/zypper-rpm-callbacks.h (original) +++ trunk/zypper/src/zypper-rpm-callbacks.h Mon Sep 3 14:15:45 2007 @@ -137,13 +137,16 @@ { virtual void start( zypp::Resolvable::constPtr resolvable ) { - display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), 0); + //! \todo (10.3+) use format + display_progress ( "remove-resolvable", cout, + _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), 0); } virtual bool progress(int value, zypp::Resolvable::constPtr resolvable) { // TranslatorExplanation This text is a progress display label e.g. "Removing [42%]" - display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), value); + display_progress ( "remove-resolvable", cout, + _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), value); return true; } @@ -177,7 +180,7 @@ void display_step( zypp::Resolvable::constPtr resolvable, int value ) { - // TranslatorExplanation This text is a progress display label e.g. "Installing [42%]" + // TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]" string s = boost::str(boost::format(_("Installing: %s-%s")) % resolvable->name() % resolvable->edition()); display_progress ( "install-resolvable", cout, s, value); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org