- removing rpm message improved (#307132)

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index cdbdcc2..eb3751e 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -746,8 +746,11 @@ int show_summary()
 
   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."))

diff --git a/src/zypper-rpm-callbacks.h b/src/zypper-rpm-callbacks.h
index 512686b..f534a71 100644 (file)
--- a/src/zypper-rpm-callbacks.h
+++ b/src/zypper-rpm-callbacks.h
@@ -137,13 +137,16 @@ struct RemoveResolvableReportReceiver : public zypp::callback::ReceiveReport<zyp
 {
   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 @@ struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReport<zy
 
   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);