diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-31 16:06:27 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-31 16:06:27 +0000 |
| commit | 1a82c63ec114f123def943e16e8ec5ceaf8ed85a (patch) | |
| tree | ab76b572a75f2ae5c0e22c1544b55c90efc3361d | |
| parent | 80a26ed1fb36c6cdc07a4dc08ed46a405065b949 (diff) | |
* include a human readable string for the MediaChange status-fd message as well
| -rw-r--r-- | README.progress-reporting | 4 | ||||
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/README.progress-reporting b/README.progress-reporting index 285ca6190..b575e7879 100644 --- a/README.progress-reporting +++ b/README.progress-reporting @@ -49,10 +49,10 @@ pmconffile:conffile:percent:'current-conffile' 'new-conffile' useredited distedi media-change ------------ -media-change:medium:drive +media-change:medium:drive:human-readable string example: -media-change: Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830):/cdrom/ +media-change: Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830):/cdrom/:Please insert the disc labeled: 'Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830)' in the drive '/cdrom/' and press enter. dlstatus diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index e2b8bf9e4..d06024178 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -374,9 +374,14 @@ bool pkgAcquire::Worker::MediaChange(string Message) string Media = LookupTag(Message,"Media"); string Drive = LookupTag(Message,"Drive"); ostringstream msg,status; + ioprintf(msg,_("Please insert the disc labeled: " + "'%s' " + "in the drive '%s' and press enter."), + Media.c_str(),Drive.c_str()); status << "media-change: " // message - << Media << ":" //media - << Drive //drive + << Media << ":" // media + << Drive << ":" // drive + << msg.str() // l10n message << endl; write(status_fd, status.str().c_str(), status.str().size()); } |