summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-10-17 14:33:58 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-10-17 14:33:58 +0000
commitcec6091772ae3463cb04c417e3f598f9b6814516 (patch)
treeabc6b9a54e3dd8dfc938eadb12368a1cc74d15c6 /apt-pkg/deb
parent2d4722e202421007bc34f5439ab4a7cd0bd1148f (diff)
* removed the URL-Reamp hack (we have pdiff support in the main archive now), removed bw-limit support (NO idea how that got into this archive in the first place)
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/debindexfile.cc11
-rw-r--r--apt-pkg/deb/debindexfile.h2
2 files changed, 1 insertions, 12 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index b3b77dad7..ff8bce85d 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -158,17 +158,6 @@ debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Tr
{
}
/*}}}*/
-
-string debPackagesIndex::ArchiveURI(string File) const
-{
- // FIXME: EVIL! Remove as soon as pdiff support is offical
- string remap = _config->Find("APT::URL-Remap::"+URI,"");
- if(!remap.empty())
- 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 48a345adf..a1b9583a4 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;
+ virtual string ArchiveURI(string File) const {return URI + File;};
// Interface for acquire
virtual string Describe(bool Short) const;