ref: refs/heads/SuSE-Code-11-Branch
commit c40acc1a8e81d7e001f3b0e0463e064972e227ce
Author: Ján Kupec
Date: Sun Feb 15 22:11:37 2009 +0100
Return default on EOF after poll() in read_action_ari_with_timeout(). (bnc #469872)
---
package/zypper.changes | 8 ++++++++
src/utils/prompt.cc | 10 +++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/package/zypper.changes b/package/zypper.changes
index 59cab89..be431d2 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Sun Feb 15 21:58:35 CET 2009 - jkupec@suse.cz
+
+- Writing additional rpm output after installing/removing packages
+ (bnc #369450)
+
+- 1.0.7
+
+-------------------------------------------------------------------
Tue Jan 27 14:26:27 CET 2009 - jkupec@suse.cz
- Adapted authetication callback for non-curl URLs (bnc #460970)
diff --git a/src/utils/prompt.cc b/src/utils/prompt.cc
index 7e9e429..c2c210a 100644
--- a/src/utils/prompt.cc
+++ b/src/utils/prompt.cc
@@ -126,7 +126,15 @@ int read_action_ari_with_timeout (PromptId pid, unsigned timeout,
eat_rest_input();
return 2;
default:
- WAR << "Unknown char " << c << endl;
+ if (feof(stdin))
+ {
+ Zypper::instance()->out().info(zypp::str::form(_("Retrying in %u seconds..."), timeout));
+ WAR << "no good input, returning " << default_action
+ << " in " << timeout << " seconds." << endl;
+ sleep(timeout);
+ return default_action;
+ }
+ WAR << "Unknown char " << c << endl;
}
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
