summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-06-09 21:15:52 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-06-09 21:15:52 +0200
commitc91d9a630bfe95f152d574a0ca420fde2afc6b2c (patch)
treefa2d9dd359aae107fa781b6b73531c3a38fdb162
parent24d7b6267ef3e475a153d4e2c4bcb30e1d14e671 (diff)
sent Last-Modified header also for Translation files
-rw-r--r--apt-pkg/acquire-item.cc13
-rw-r--r--debian/changelog3
2 files changed, 12 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 4d9a152ab..58754a5c0 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -140,7 +140,8 @@ void pkgAcquire::Item::Rename(string From,string To)
}
}
/*}}}*/
-
+// Acquire::Item::ReportMirrorFailure /*{{{*/
+// ---------------------------------------------------------------------
void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
{
// we only act if a mirror was used at all
@@ -182,7 +183,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
_config->Find("Methods::Mirror::ProblemReporting").c_str());
}
}
-
+ /*}}}*/
// AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* Get the DiffIndex file first and see if there are patches availabe
@@ -835,7 +836,13 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
// ---------------------------------------------------------------------
string pkgAcqIndexTrans::Custom600Headers()
{
- return "\nFail-Ignore: true";
+ string Final = _config->FindDir("Dir::State::lists");
+ Final += URItoFileName(RealURI);
+
+ struct stat Buf;
+ if (stat(Final.c_str(),&Buf) != 0)
+ return "\nFail-Ignore: true";
+ return "\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
/*}}}*/
// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
diff --git a/debian/changelog b/debian/changelog
index a83d4c52a..42fe916c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low
- add a constant Exists check for MetaKeys
* apt-pkg/acquire-item.cc:
- do not try PDiff if it is not listed in the Meta file
+ - sent Last-Modified header also for Translation files
* apt-pkg/cacheiterator.h:
- let pkgCache::Iterator inherent std::iterator
* ftparchive/writer.h:
@@ -87,7 +88,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low
* apt-pkg/indexcopy.cc:
- move the gpg codecopy to a new method and use it also in methods/gpgv.cc
- -- David Kalnischkies <kalnischkies@gmail.com> Wed, 09 Jun 2010 17:18:26 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 09 Jun 2010 21:15:46 +0200
apt (0.7.26~exp5) experimental; urgency=low