* hack around file:/ uri problem when pdiffs are used (needs to be done properly...

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--pdiff--0--patch-22
   * hack around local file:/ uri problem

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2392f0f8d08ce2c4a77de6f3009fe7727c64826a..197cbf786b10d185ba271891bfa8498fb239008b 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -165,11 +165,15 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
    CurrentPackagesFile = _config->FindDir("Dir::State::lists");
    CurrentPackagesFile += URItoFileName(RealURI);
 
+   // FIXME: this file:/ check is a hack to prevent fetching
+   //        from local sources. this is really silly, and
+   //        should be fixed cleanly as soon as possible
    if(!FileExists(CurrentPackagesFile) || 
+      Desc.URI.substr(0,strlen("file:/")) == "file:/" ||
       !_config->FindB("Acquire::Diffs",true)) {
       // we don't have a pkg file or we don't want to queue
       if(Debug)
-        std::clog << "No index file or canceld by user" << std::endl;
+        std::clog << "No index file, local or canceld by user" << std::endl;
       Failed("", NULL);
       return;
    }