diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-02-25 13:26:58 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-02-25 13:26:58 +0000 |
| commit | 2aab5956ebcaec3aa6c71f069a202366c872bb87 (patch) | |
| tree | 7d8487416bf6076e406d91eae9a680f12249b9a2 | |
| parent | 1c5f7e5fc5c0377718d203e78d4af164ee3e60f8 (diff) | |
* fix for apt-get update removing the cdroms Release.gpg files
| -rw-r--r-- | apt-pkg/acquire-item.cc | 12 | ||||
| -rw-r--r-- | methods/cdrom.cc | 2 | ||||
| -rw-r--r-- | po/apt-all.pot | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index de8cfe8f2..714edd8d8 100644 --- 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() { - // 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; - 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); diff --git a/methods/cdrom.cc b/methods/cdrom.cc index d5987dc45..d8bb9522e 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; } diff --git a/po/apt-all.pot b/po/apt-all.pot index 23a0ad16c..d40d44701 100644 --- 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" -"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" |