Author: dmacvicar
Date: Tue Jul 24 17:34:19 2007
New Revision: 6186
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6186&view=rev
Log:
reenable media callbacks
Modified:
trunk/zypper/src/CMakeLists.txt
trunk/zypper/src/zypper-media-callbacks.h
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-misc.h
Modified: trunk/zypper/src/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=6186&r1=6185&r2=6186&view=diff
==============================================================================
--- trunk/zypper/src/CMakeLists.txt (original)
+++ trunk/zypper/src/CMakeLists.txt Tue Jul 24 17:34:19 2007
@@ -3,19 +3,6 @@
-DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\"
)
-SET( zypper_SRCS
- zypper.cc
- zypper-command.cc
- zypper-getopt.cc
- zypper-sources.cc
- zypper-misc.cc
- zypper-utils.cc
- zypper-search.cc
- zypper-info.cc
- zypper-tabulator.cc
- zypper-callbacks.cc
-)
-
SET (zypper_HEADERS
zypper.h
zypper-command.h
@@ -33,6 +20,22 @@
zypper-source-callbacks.h
)
+SET( zypper_SRCS
+ zypper.cc
+ zypper-command.cc
+ zypper-getopt.cc
+ zypper-sources.cc
+ zypper-misc.cc
+ zypper-utils.cc
+ zypper-search.cc
+ zypper-info.cc
+ zypper-tabulator.cc
+ zypper-callbacks.cc
+ ${zypper_HEADERS}
+)
+
+
+
ADD_EXECUTABLE( zypper ${zypper_SRCS} )
TARGET_LINK_LIBRARIES( zypper ${ZYPP_LIBRARY} ${READLINE_LIBRARY} )
Modified: trunk/zypper/src/zypper-media-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callbacks.h?rev=6186&r1=6185&r2=6186&view=diff
==============================================================================
--- trunk/zypper/src/zypper-media-callbacks.h (original)
+++ trunk/zypper/src/zypper-media-callbacks.h Tue Jul 24 17:34:19 2007
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
@@ -26,23 +27,25 @@
using zypp::media::MediaChangeReport;
using zypp::media::DownloadProgressReport;
+using zypp::Repository;
///////////////////////////////////////////////////////////////////
namespace ZmartRecipients
{
struct MediaChangeReportReceiver : public zypp::callback::ReceiveReport<MediaChangeReport>
- {/*
- virtual MediaChangeReport::Action requestMedia( zypp::Source_Ref source, unsigned mediumNr, MediaChangeReport::Error error, const std::string & description )
- {
+ {
+ virtual MediaChangeReport::Action requestMedia( Repository repo,
+ unsigned mediumNr,
+ MediaChangeReport::Error error,
+ const std::string & description )
+ {
cout << "Please insert media [" << description << "] # " << mediumNr << ". Retry [y/n]: " << endl;
if (readBoolAnswer())
return MediaChangeReport::RETRY;
else
return MediaChangeReport::ABORT;
-
}
- */
};
// progress for downloading a file
@@ -87,6 +90,7 @@
public:
MediaCallbacks()
{
+ MIL << "Set media callbacks.." << endl;
_mediaChangeReport.connect();
_mediaDownloadReport.connect();
}
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=6186&r1=6185&r2=6186&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Jul 24 17:34:19 2007
@@ -25,6 +25,30 @@
extern RuntimeData gData;
extern Settings gSettings;
+// return the default value on input failure
+// TODO make this locale dependent?
+bool read_bool_with_default (bool defval) {
+ istream & stm = cin;
+
+ string c = "";
+ while (stm.good () && c != "y" && c != "Y" && c != "N" && c != "n")
+ c = zypp::str::getline (stm, zypp::str::TRIM);
+
+ if (c == "y" || c == "Y")
+ return true;
+ else if (c == "n" || c == "N")
+ return false;
+ else
+ return defval;
+}
+
+// Read an answer (ynYN)
+// Defaults to 'false'
+bool readBoolAnswer()
+{
+ return read_bool_with_default (false);
+}
+
void cond_init_target () {
static bool done = false;
Modified: trunk/zypper/src/zypper-misc.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.h?rev=6186&r1=6185&r2=6186&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.h (original)
+++ trunk/zypper/src/zypper-misc.h Tue Jul 24 17:34:19 2007
@@ -16,6 +16,8 @@
#include "zypp/PoolItem.h"
#include "zypper-tabulator.h"
+bool readBoolAnswer();
+
/**
* Initialize rpm database on target, if not already initialized.
*/
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
