From cbaf353ead58aa9eefe51542b6ad91e69b6289ce Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 28 Jun 2017 12:57:51 +0200
Subject: fail instead of warn on insecure repositories in apt-get
The exception was made to give (script) users a one-release grace period
to adapt their setup to deal with apt enforcing signing of repositories.
As we are now at the start of a new release cycle its as good a time as
any to lift it now.
Removes-Exception: 952ee63b0af14a534c0aca00c11d1a99be6b22b2
---
apt-private/private-cmndline.cc | 4 ----
1 file changed, 4 deletions(-)
(limited to 'apt-private')
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index de3992a00..06683ae61 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -463,8 +463,6 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/
_config->CndSet("Binary::apt::DPkg::Progress-Fancy", true);
_config->CndSet("Binary::apt::APT::Keep-Downloaded-Packages", false);
}
- if (binary == "apt-config")
- _config->CndSet("Binary::apt-get::Acquire::AllowInsecureRepositories", true);
_config->Set("Binary", binary);
}
@@ -472,8 +470,6 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/
static void BinaryCommandSpecificConfiguration(char const * const Binary, char const * const Cmd)/*{{{*/
{
std::string const binary = flNotDir(Binary);
- if (binary == "apt-get" && CmdMatches("update"))
- _config->CndSet("Binary::apt-get::Acquire::AllowInsecureRepositories", true);
if ((binary == "apt" || binary == "apt-get") && CmdMatches("upgrade", "dist-upgrade", "full-upgrade"))
{
//FIXME: the option is documented to apply only for install/remove, so
--
cgit v1.2.3