* fix for apt-get update removing the cdroms Release.gpg files

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index de8cfe8f2249e2b74d2aeccd46b93264663bcf94..714edd8d8caff9920f9e10ffbfbb1de1ee0c1575 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -350,18 +350,8 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
 /* The only header we use is the last-modified header. */
 string pkgAcqMetaSig::Custom600Headers()
 {
 /* The only header we use is the last-modified header. */
 string pkgAcqMetaSig::Custom600Headers()
 {

-   // mvo: we don't really need the last-modified header here
-   //      1) it points to "Final" and that was renamed to "DestFile" 
-   //         so it's never send anyway
-   //      2) because DestFIle is in partial/ we will send a partial request
-   //         with if-range in the http method (or the equivalent for ftp). 
-   //         that should give the same result
-
-   string Final = _config->FindDir("Dir::State::lists");
-   Final += URItoFileName(RealURI);
-   

    struct stat Buf;
    struct stat Buf;

-   if (stat(Final.c_str(),&Buf) != 0)
+   if (stat(DestFile.c_str(),&Buf) != 0)

       return "\nIndex-File: true";
 
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
       return "\nIndex-File: true";
 
    return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d5987dc45f546dc6ab3029339b365fd49ee6781a..d8bb9522e2a74d2d4d9ef110e4368ccd44db058d 100644 (file)
--- 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.LastModified = Itm->LastModified;
       Res.IMSHit = true;

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

       URIDone(Res);
       return true;
    }
       URIDone(Res);
       return true;
    }

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 23a0ad16cae4729ad1f30b62f15616bae3c71374..d40d44701012bd567b9d083a957ff932eb303400 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-02-11 00:08+0100\n"
+"POT-Creation-Date: 2005-02-08 16:58+0100\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"