summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-09-13 14:09:50 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-09-13 14:09:50 +0000
commit2a7497704e9dee1f1d987e7a2cd59e939d991909 (patch)
tree98087e3e9e8fa60a9a782bed102f57d34123faa9 /cmdline
parentcdadf54b3ab67aed6e9ecf902aabf4cc9896ef9e (diff)
* merged from apt--cdrom-fallback--0
Patches applied: * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-110 * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-1 * initial patch to make falling back from cdrom possible * michael.vogt@ubuntu.com--2005/apt--cdrom-fallback--0--patch-2 * fix in methods/cdrom.cc: don't call Fail() but return false so that apt can fallback to a differencent source
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/acqprogress.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index 8b30b324b..a5fee1db5 100644
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -274,10 +274,16 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
Media.c_str(),Drive.c_str());
char C = 0;
+ bool bStatus = true;
while (C != '\n' && C != '\r')
- read(STDIN_FILENO,&C,1);
-
- Update = true;
- return true;
+ {
+ int len = read(STDIN_FILENO,&C,1);
+ if(C == 'c' || len <= 0)
+ bStatus = false;
+ }
+
+ if(bStatus)
+ Update = true;
+ return bStatus;
}
/*}}}*/