X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b3d44315ee812ba2d0a99751695b5a4314407ec2..77a7df0e00b10252abb2fe52a083d53d5878ab11:/methods/cdrom.cc?ds=sidebyside

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d5987dc45..7cc036814 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -97,7 +97,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;
-      Res.Filename = File;
+      Res.Filename = Itm->DestFile;
       URIDone(Res);
       return true;
    }
@@ -119,15 +119,15 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    // All non IMS queries for package files fail.
    if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)
    {
-      Fail(_("Please use apt-cdrom to make this CD recognized by APT."
-	   " apt-get update cannot be used to add new CDs"));
+      Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT."
+	   " apt-get update cannot be used to add new CD-ROMs"));
       return true;
    }
 
    // We already have a CD inserted, but it is the wrong one
    if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
    {
-      Fail(_("Wrong CD"),true);
+      Fail(_("Wrong CD-ROM"),true);
       return true;
    }
    
@@ -165,7 +165,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       if (MediaFail(Get.Host,CDROM) == false)
       {
 	 CurrentID = "FAIL";
-	 Fail(_("Wrong CD"),true);
+	 Fail(_("Wrong CD-ROM"),true);
 	 return true;
       }
    }