* meda-change message is send over status-fd now

diff --git a/README.progress-reporting b/README.progress-reporting
index 73fbd8c0877a9ba90a29992d65b18a7cc02900cd..285ca6190487e1eb2f10e219bdce894a19e8f57d 100644 (file)
--- a/README.progress-reporting
+++ b/README.progress-reporting
@@ -5,7 +5,7 @@ If the apt options: "APT::Status-Fd" is set, apt will send status
 reports to that fd. The status information is seperated with a ':', 
 there are the following status conditions:
 
 reports to that fd. The status information is seperated with a ':', 
 there are the following status conditions:
 

-status = {"pmstatus", "dlstatus", "conffile-prompt", "error" } 
+status = {"pmstatus", "dlstatus", "conffile-prompt", "error", "media-change" } 

 
 The reason for using a fd instead of a OpProgress class is that many
 apt frontend fork a (vte) terminal for the actual installation.
 
 The reason for using a fd instead of a OpProgress class is that many
 apt frontend fork a (vte) terminal for the actual installation.


@@ -47,6 +47,13 @@ pmconffile
 pmconffile:conffile:percent:'current-conffile' 'new-conffile' useredited distedited
 
 
 pmconffile:conffile:percent:'current-conffile' 'new-conffile' useredited distedited
 
 

+media-change
+------------
+media-change:medium:drive
+
+example:
+media-change: Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830):/cdrom/
+

 
 dlstatus
 --------
 
 dlstatus
 --------

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 5cd7d6f1e640458aef11edffb85357605bbdec97..e2b8bf9e4f01841bce2b41c04360a4d8b7cd01ed 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -25,6 +25,7 @@
 #include <apti18n.h>
 
 #include <iostream>
 #include <apti18n.h>
 
 #include <iostream>

+#include <sstream>

 #include <fstream>
     
 #include <sys/stat.h>
 #include <fstream>
     
 #include <sys/stat.h>


@@ -367,6 +368,19 @@ bool pkgAcquire::Worker::Capabilities(string Message)
 /* */
 bool pkgAcquire::Worker::MediaChange(string Message)
 {
 /* */
 bool pkgAcquire::Worker::MediaChange(string Message)
 {

+   int status_fd = _config->FindI("APT::Status-Fd",-1);
+   if(status_fd > 0) 
+   {
+      string Media = LookupTag(Message,"Media");
+      string Drive = LookupTag(Message,"Drive"); 
+      ostringstream msg,status;
+      status << "media-change: "  // message
+            << Media  << ":"     //media
+            << Drive  //drive
+            << endl;
+      write(status_fd, status.str().c_str(), status.str().size());
+   }
+

    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
                                    LookupTag(Message,"Drive")) == false)
    {
    if (Log == 0 || Log->MediaChange(LookupTag(Message,"Media"),
                                    LookupTag(Message,"Drive")) == false)
    {