summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-11 11:26:25 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-11 11:26:25 +0100
commit949a049861cd3da61b43b24fc24f157a920ea581 (patch)
tree03bde766f0eed1032f7b9775dc857462dbad426c
parent7fa81183d6b55e6597354a4b4ab8cbb9e2ea992e (diff)
merged from lp:~mvo/apt/mvo
-rw-r--r--apt-pkg/acquire-item.cc4
-rw-r--r--debian/changelog9
2 files changed, 11 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d4df31e85..497edbaac 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1002,8 +1002,8 @@ string pkgAcqIndexTrans::Custom600Headers()
struct stat Buf;
if (stat(Final.c_str(),&Buf) != 0)
- return "\nFail-Ignore: true";
- return "\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+ return "\nFail-Ignore: true\nIndex-File: true";
+ return "\nFail-Ignore: true\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
/*}}}*/
// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
diff --git a/debian/changelog b/debian/changelog
index f02e12f80..9747ddeb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.8.12ubuntu1) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.cc:
+ - mark pkgAcqIndexTrans as Index-File to avoid asking the
+ user to insert the CD on each apt-get update
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100
+
apt (0.8.12ubuntu1) natty; urgency=low
* merged from debian/sid, this adds important fixes in the udev based