merged from lp:~mvo/apt/mvo

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d4df31e85bc067f8267c340a48e929bac176ff46..497edbaacc40e8a43362536662ed28c0709f0b26 100644 (file)
--- 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)
 
    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  /*{{{*/
 }
                                                                        /*}}}*/
 // AcqIndexTrans::Failed - Silence failure messages for missing files  /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index f02e12f800ad7f4dc1bb11d2481b7861791cd11e..9747ddeb5122ffab49b26155d98e00b0e0537960 100644 (file)
--- 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
 apt (0.8.12ubuntu1) natty; urgency=low
 
   * merged from debian/sid, this adds important fixes in the udev based