Author: jkupec
Date: Thu Jul 26 12:14:04 2007
New Revision: 6220
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6220&view=rev
Log:
- fixed non-interactive mode for media change request (#294685)
Modified:
trunk/zypper/src/zypper-media-callbacks.h
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-misc.h
Modified: trunk/zypper/src/zypper-media-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callbacks.h?rev=6220&r1=6219&r2=6220&view=diff
==============================================================================
--- trunk/zypper/src/zypper-media-callbacks.h (original)
+++ trunk/zypper/src/zypper-media-callbacks.h Thu Jul 26 12:14:04 2007
@@ -23,6 +23,7 @@
#include
#include
+#include "zypper-callbacks.h"
#include "AliveCursor.h"
using zypp::media::MediaChangeReport;
@@ -40,8 +41,11 @@
MediaChangeReport::Error error,
const std::string & description )
{
- cout << "Please insert media [" << description << "] # " << mediumNr << ". Retry [y/n]: " << endl;
- if (readBoolAnswer())
+ // TranslatorExplanation don't translate letters 'y' and 'n' for now
+ std::string request = boost::str(boost::format(
+ _("Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."))
+ % description % mediumNr);
+ if (read_bool_answer(request, false))
return MediaChangeReport::RETRY;
else
return MediaChangeReport::ABORT;
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=6220&r1=6219&r2=6220&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Thu Jul 26 12:14:04 2007
@@ -25,30 +25,6 @@
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=6220&r1=6219&r2=6220&view=diff
==============================================================================
--- trunk/zypper/src/zypper-misc.h (original)
+++ trunk/zypper/src/zypper-misc.h Thu Jul 26 12:14:04 2007
@@ -16,8 +16,6 @@
#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
