Sync with apt@packages.debian.org/apt--main--0--patch-75

[apt.git] / methods / cdrom.cc

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 17872de2929b5457690f7468a0d735cb5c2ace74..7cc0368141fb99f38bc06675edbb488d337f72e1 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdrom.cc,v 1.21 2004/01/07 20:39:38 mdz Exp $
+// $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    CDROM URI method for APT
 /* ######################################################################
 
    CDROM URI method for APT


@@ -97,7 +97,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;
    {
       Res.LastModified = Itm->LastModified;
       Res.IMSHit = true;

-      Res.Filename = File;
+      Res.Filename = Itm->DestFile;

       URIDone(Res);
       return true;
    }
       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)
    {
    // 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)
    {
       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;
    }
    
       return true;
    }
    


@@ -165,7 +165,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
       if (MediaFail(Get.Host,CDROM) == false)
       {
         CurrentID = "FAIL";
       if (MediaFail(Get.Host,CDROM) == false)
       {
         CurrentID = "FAIL";

-        Fail(_("Wrong CD"),true);
+        Fail(_("Wrong CD-ROM"),true);

         return true;
       }
    }
         return true;
       }
    }


@@ -187,6 +187,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

+   setlocale(LC_ALL, "");
+

    CDROMMethod Mth;
    return Mth.Run();
 }
    CDROMMethod Mth;
    return Mth.Run();
 }