summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2005-11-30 17:15:17 +0000
committerMichael Vogt <mvo@debian.org>2005-11-30 17:15:17 +0000
commitfacac1c52ebe40656af693502cab66eb4c09ad2f (patch)
tree38ea76bce2eea7ba45644e60f40168c36af2989e
parent39c7baef5ef2fe40b539833714913bd8a85279cd (diff)
parentb4e57d2dd44728929cb83113ed79c8e16405767e (diff)
* hack around file:/ uri problem when pdiffs are used (needs to be done properly some day :/)
Patches applied: * michael.vogt@ubuntu.com--2005/apt--pdiff--0--patch-22 * hack around local file:/ uri problem
-rw-r--r--apt-pkg/acquire-item.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2392f0f8d..197cbf786 100644
--- 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;
}