diff options
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/acqprogress.cc | 11 | ||||
| -rw-r--r-- | cmdline/apt-cdrom.cc | 15 |
2 files changed, 19 insertions, 7 deletions
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 01f6f7945..428f9a4d6 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acqprogress.cc,v 1.5 1998/12/04 21:16:52 jgg Exp $ +// $Id: acqprogress.cc,v 1.6 1998/12/04 23:33:17 jgg Exp $ /* ###################################################################### Acquire Progress - Command line progress meter @@ -235,11 +235,12 @@ bool AcqTextStatus::MediaChange(string Media,string Drive) { if (Quiet <= 0) cout << '\r' << BlankLine << '\r'; - cout << "Media Change: Please insert the Disc labeled '" << Media << "' in "\ - " the drive '" << Drive << "' and press a key" << endl; + cout << "Media Change: Please insert the disc labeled '" << Media << "' in "\ + "the drive '" << Drive << "' and press enter" << endl; - char C; - read(STDIN_FILENO,&C,1); + char C = 0; + while (C != '\n' && C != '\r') + read(STDIN_FILENO,&C,1); Update = true; return true; diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 5a0ace8b6..1985c22a6 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.6 1998/11/29 01:19:20 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.7 1998/12/04 23:33:18 jgg Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. @@ -791,8 +791,11 @@ bool DoAdd(CommandLine &) { // Startup string CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); - cout << "Using CD-ROM mount point " << CDROM << endl; + if (CDROM[0] == '.') + CDROM= SafeGetCWD() + '/' + CDROM; + cout << "Using CD-ROM mount point " << CDROM << endl; + // Read the database Configuration Database; string DFile = _config->FindFile("Dir::State::cdroms"); @@ -823,7 +826,11 @@ bool DoAdd(CommandLine &) cout << "Identifying.. " << flush; string ID; if (IdentCdrom(CDROM,ID) == false) + { + cout << endl; return false; + } + cout << '[' << ID << ']' << endl; cout << "Scanning Disc for index files.. " << flush; @@ -831,7 +838,11 @@ bool DoAdd(CommandLine &) vector<string> List; string StartDir = SafeGetCWD(); if (FindPackages(CDROM,List) == false) + { + cout << endl; return false; + } + chdir(StartDir.c_str()); if (_config->FindB("Debug::aptcdrom",false) == true) |