summaryrefslogtreecommitdiffstats
path: root/debian/patches/progress-linux
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 11:09:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 11:09:20 +0000
commit26878b9c90c5fabf3798aeddb45d4c3147d6890a (patch)
tree16e8f7376821a27fe7fe0b3a2b2fda08d5f7b8fb /debian/patches/progress-linux
parentMerging debian version 2.9.0. (diff)
downloadapt-26878b9c90c5fabf3798aeddb45d4c3147d6890a.tar.xz
apt-26878b9c90c5fabf3798aeddb45d4c3147d6890a.zip
Refreshing apt-options.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/progress-linux')
-rw-r--r--debian/patches/progress-linux/0001-apt-options.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/progress-linux/0001-apt-options.patch b/debian/patches/progress-linux/0001-apt-options.patch
index 905944a..02ae46e 100644
--- a/debian/patches/progress-linux/0001-apt-options.patch
+++ b/debian/patches/progress-linux/0001-apt-options.patch
@@ -4,10 +4,10 @@ Description: Using apt binary specific configuration for apt-get.
diff -Naurp apt.orig/apt-private/private-cmndline.cc apt/apt-private/private-cmndline.cc
--- apt.orig/apt-private/private-cmndline.cc
+++ apt/apt-private/private-cmndline.cc
-@@ -472,7 +472,7 @@ static bool ShowCommonHelp(APT_CMD const
- static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/
- {
- std::string const binary = flNotDir(Binary);
+@@ -485,7 +485,7 @@ static void BinarySpecificConfiguration(
+ {
+ _config->CndSet("Binary::apt-cdrom::APT::Internal::OpProgress::EraseLines", false);
+ }
- if (binary == "apt" || binary == "apt-config")
+ if (binary == "apt" || binary == "apt-get" || binary == "apt-config")
{