summaryrefslogtreecommitdiff
path: root/apt-private/private-source.cc
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2021-04-29 08:26:11 +0000
committerJulian Andres Klode <jak@debian.org>2021-04-29 08:26:11 +0000
commit5d81ec308275b625a20b889fa3daa43815ddc80d (patch)
tree2bc62cbc973e58ec2f04ae4aa22bcef45b8a1519 /apt-private/private-source.cc
parentb942031ddfe5b40b527668a8561b5ab137632fd9 (diff)
parent6f01e7cc0c6f231711b3b81a81beb3775f0a855a (diff)
Merge branch 'pu/autoremove' into 'main'
Mark only provides from protected versioned kernel packages See merge request apt-team/apt!168
Diffstat (limited to 'apt-private/private-source.cc')
-rw-r--r--apt-private/private-source.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index 9b47ce31f..5d1db5a50 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -652,6 +652,7 @@ bool DoBuildDep(CommandLine &CmdL)
std::string const pseudoArch = hostArch.empty() ? nativeArch : hostArch;
CacheFile Cache;
+ Cache.InhibitActionGroups(true);
auto VolatileCmdL = GetPseudoPackages(Cache.GetSourceList(), CmdL, AddVolatileSourceFile, pseudoArch);
auto AreDoingSatisfy = strcasecmp(CmdL.FileList[0], "satisfy") == 0;
@@ -820,7 +821,6 @@ bool DoBuildDep(CommandLine &CmdL)
APT::PackageVector removeAgain;
{
- pkgDepCache::ActionGroup group(Cache);
TryToInstall InstallAction(Cache, &Fix, false);
std::list<std::pair<pkgCache::VerIterator, std::string>> candSwitch;
for (auto const &pkg: pseudoPkgs)
@@ -856,7 +856,6 @@ bool DoBuildDep(CommandLine &CmdL)
return false;
{
- pkgDepCache::ActionGroup group(Cache);
if (_config->FindB(AreDoingSatisfy ? "APT::Get::Satisfy-Automatic" : "APT::Get::Build-Dep-Automatic", false) == false)
{
for (auto const &pkg: removeAgain)