Просмотр исходного кода

* include a human readable string for the MediaChange status-fd message as well

Michael Vogt лет назад: 21
Родитель
Сommit
1a82c63ec1
2 измененных файлов с 9 добавлено и 4 удалено
  1. 2 2
      README.progress-reporting
  2. 7 2
      apt-pkg/acquire-worker.cc

+ 2 - 2
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

+ 7 - 2
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());
    }