Author: jkupec
Date: Thu Feb 21 18:25:19 2008
New Revision: 8855
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8855&view=rev
Log:
- more progress -> Out
Modified:
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/output/xmlout.rnc
trunk/zypper/src/zypper-callbacks.cc
trunk/zypper/src/zypper-callbacks.h
trunk/zypper/src/zypper-media-callbacks.h
trunk/zypper/src/zypper-repo-callbacks.h
trunk/zypper/src/zypper-repos.cc
trunk/zypper/src/zypper-rpm-callbacks.h
Modified: trunk/zypper/src/output/Out.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.h?rev=8855&r1=8854&r2=8855&view=diff
==============================================================================
--- trunk/zypper/src/output/Out.h (original)
+++ trunk/zypper/src/output/Out.h Thu Feb 21 18:25:19 2008
@@ -98,14 +98,15 @@
const std::string & label,
int value = -1) = 0;
virtual void progressEnd(const std::string & id,
- const std::string & label) = 0;
+ const std::string & label,
+ bool error = false) = 0; // might be a string with error message instead
// progress with download rate
virtual void dwnldProgressStart(const zypp::Url & uri) = 0;
virtual void dwnldProgress(const zypp::Url & uri,
int value = -1,
int rate = -1) = 0;
- virtual void dwnldProgressEnd(const zypp::Url & uri) = 0;
+ virtual void dwnldProgressEnd(const zypp::Url & uri, bool error = false) = 0;
virtual void prompt(PromptId id,
const std::string & prompt,
Modified: trunk/zypper/src/output/OutNormal.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?rev=8855&r1=8854&r2=8855&view=diff
==============================================================================
--- trunk/zypper/src/output/OutNormal.cc (original)
+++ trunk/zypper/src/output/OutNormal.cc Thu Feb 21 18:25:19 2008
@@ -123,7 +123,7 @@
display_tick(id, label);
}
-void OutNormal::progressEnd(const std::string & id, const string& label)
+void OutNormal::progressEnd(const std::string & id, const string & label, bool error)
{
if (progressFilter())
return;
@@ -167,7 +167,7 @@
cout << std::flush;
}
-void OutNormal::dwnldProgressEnd(const zypp::Url & uri)
+void OutNormal::dwnldProgressEnd(const zypp::Url & uri, bool error)
{
if (verbosity() < NORMAL)
return;
@@ -178,7 +178,7 @@
cout << uri; //! \todo shorten to fit the width of the terminal
else
cout << zypp::Pathname(uri.getPathName()).basename();
- cout << " [" << _("done") << "]";
+ cout << " [" << (error ? _("error") : _("done")) << "]";
cout << endl << std::flush;
}
Modified: trunk/zypper/src/output/OutNormal.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.h?rev=8855&r1=8854&r2=8855&view=diff
==============================================================================
--- trunk/zypper/src/output/OutNormal.h (original)
+++ trunk/zypper/src/output/OutNormal.h Thu Feb 21 18:25:19 2008
@@ -24,14 +24,16 @@
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);
+ virtual void progressEnd(const std::string & id,
+ const std::string & label,
+ bool error);
// progress with download rate
virtual void dwnldProgressStart(const zypp::Url & uri);
virtual void dwnldProgress(const zypp::Url & uri,
int value = -1,
int rate = -1);
- virtual void dwnldProgressEnd(const zypp::Url & uri);
+ virtual void dwnldProgressEnd(const zypp::Url & uri, bool error);
virtual void prompt(PromptId id,
const std::string & prompt,
Modified: trunk/zypper/src/output/OutXML.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutXML.cc?rev=8855&r1=8854&r2=8855&view=diff
==============================================================================
--- trunk/zypper/src/output/OutXML.cc (original)
+++ trunk/zypper/src/output/OutXML.cc Thu Feb 21 18:25:19 2008
@@ -75,14 +75,15 @@
}
void OutXML::writeProgressTag(const string & id, const string & label,
- int value, bool done)
+ int value, bool done, bool error)
{
cout << "