2 files changed, 16 insertions, 1 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index ff8bce85d..3ceeffdca 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -158,6 +158,21 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr
 {
 }
 									/*}}}*/
+
+string debPackagesIndex::ArchiveURI(string File) const
+{
+   // FIXME: Remove as soon as pdiff support is offical
+   string remap = _config->Find("APT::Diffs::Remap::"+URI,"");
+   if(!remap.empty())
+   {
+      std::cout << "doing a evil remapping to the URI as requested!\n";
+      std::cout << URI << " -> " << remap << std::endl;
+      return remap+File;
+   }
+
+   return URI + File;
+}
+
 // PackagesIndex::ArchiveInfo - Short version of the archive url	/*{{{*/
 // ---------------------------------------------------------------------
 /* This is a shorter version that is designed to be < 60 chars or so */
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index a1b9583a4..48a345adf 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -59,7 +59,7 @@ class debPackagesIndex : public pkgIndexFile
 
    // Stuff for accessing files on remote items
    virtual string ArchiveInfo(pkgCache::VerIterator Ver) const;
-   virtual string ArchiveURI(string File) const {return URI + File;};
+   virtual string ArchiveURI(string File) const;
    
    // Interface for acquire
    virtual string Describe(bool Short) const;