diff --git a/apt-0.5.15cnc5-alt-debsystem.patch b/apt-0.5.15cnc5-alt-debsystem.patch deleted file mode 100644 index 7f2296e..0000000 --- a/apt-0.5.15cnc5-alt-debsystem.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uprk.orig apt-0.5.15cnc5.orig/apt-pkg/deb/debsystem.cc apt-0.5.15cnc5/apt-pkg/deb/debsystem.cc ---- apt-0.5.15cnc5.orig/apt-pkg/deb/debsystem.cc 2003-12-23 23:18:33 +0300 -+++ apt-0.5.15cnc5/apt-pkg/deb/debsystem.cc 2004-01-16 15:12:44 +0300 -@@ -185,6 +185,8 @@ bool debSystem::ArchiveSupported(const c - signed debSystem::Score(Configuration const &Cnf) - { - signed Score = 0; -+ if (Cnf.FindB("APT::Ignore-dpkg",true) == true) -+ return Score; - if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true) - Score += 10; - if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true) diff --git a/apt/apt-pkg/deb/debsystem.cc b/apt/apt-pkg/deb/debsystem.cc index 5f5e7db..df1fd48 100644 --- a/apt/apt-pkg/deb/debsystem.cc +++ b/apt/apt-pkg/deb/debsystem.cc @@ -185,6 +185,8 @@ bool debSystem::ArchiveSupported(const char *Type) signed debSystem::Score(Configuration const &Cnf) { signed Score = 0; + if (Cnf.FindB("APT::Ignore-dpkg",true) == true) + return Score; if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true) Score += 10; if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)