diff options
| author | Julian Andres Klode <jak@debian.org> | 2020-02-26 20:28:47 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2020-02-26 20:28:47 +0000 |
| commit | b71b6802fe64723117bce6d91495a8af98ac528a (patch) | |
| tree | ebb655eb7496799009b672c39799f670a596eb3e /apt-private | |
| parent | be22f24669bb6731b5835dc0e1b459d821683a9c (diff) | |
| parent | 93e1565796b61eb44bec39f50e09a34cbe090178 (diff) | |
Merge branch 'pu/wait-lock' into 'master'
Pu/wait lock
See merge request apt-team/apt!109
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/private-cmndline.cc | 5 |
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); |