X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/80a26ed1fb36c6cdc07a4dc08ed46a405065b949..e6065cfcf0b5c6a57aa582cb3c2bd2b3fafe64b7:/apt-pkg/acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index e2b8bf9e4..8ab67778b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -307,6 +307,13 @@ bool pkgAcquire::Worker::RunMessages()
 	    pkgAcquire::Item *Owner = Itm->Owner;
 	    pkgAcquire::ItemDesc Desc = *Itm;
 	    OwnerQ->ItemDone(Itm);
+
+	    // set some status
+	    if(LookupTag(Message,"FailReason") == "Timeout" || 
+	       LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+	       LookupTag(Message,"FailReason") == "ConnectionRefused") 
+	       Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
+
 	    Owner->Failed(Message,Config);
 	    ItemDone();
 
@@ -374,9 +381,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());
    }