summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2020-02-26 20:31:03 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2020-02-26 20:36:52 +0100
commit93e1565796b61eb44bec39f50e09a34cbe090178 (patch)
treeebb655eb7496799009b672c39799f670a596eb3e /apt-private
parentdb678df196ccd8f9f6fb336706cf5701d1e53aa6 (diff)
apt(8): Wait for frontend and cache lock
This is a rework of !6 with additional stuff for the frontend lock, so we can lock the frontend lock and then keep looping over dpkg lock.
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-cmndline.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index c5edae5d0..478cb95f1 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -475,6 +475,11 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/
_config->CndSet("Binary::apt::APT::Keep-Downloaded-Packages", false);
_config->CndSet("Binary::apt::APT::Get::Update::InteractiveReleaseInfoChanges", true);
_config->CndSet("Binary::apt::APT::Cmd::Pattern-Only", true);
+
+ if (isatty(STDIN_FILENO))
+ _config->CndSet("Binary::apt::Dpkg::Lock::Timeout", -1);
+ else
+ _config->CndSet("Binary::apt::Dpkg::Lock::Timeout", 120);
}
_config->Set("Binary", binary);