From 8276cdafe3c23edb08b87e49ae730a357ab07034 Mon Sep 17 00:00:00 2001 From: Gleb Fotengauer-Malinovskiy Date: Fri, 16 May 2014 19:54:03 +0400 Subject: [PATCH] Apply apt-0.5.15cnc5-alt-debsystem.patch Added in commit 3212342: 0.5.5cnc1-alt3 - Introduced APT::Ignore-dpkg support and set this flag by default, to address #0002119. --- apt-0.5.15cnc5-alt-debsystem.patch | 12 ------------ apt/apt-pkg/deb/debsystem.cc | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 apt-0.5.15cnc5-alt-debsystem.patch 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)