Merge remote-tracking branch 'origin/pr/365'

* origin/pr/365: Make `apt-get update` exit codes reliable
QubesOS · Mar 5, 2022 · 32c81ec · 32c81ec
2 parents 597adb4 + 05616e6
commit 32c81ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
@@ -1,6 +1,7 @@
 etc/apt/apt.conf.d/00notify-hook
-etc/apt/apt.conf.d/70no-unattended
 etc/apt/apt.conf.d/10no-cache
+etc/apt/apt.conf.d/41error-on-any
+etc/apt/apt.conf.d/70no-unattended
 etc/apt/sources.list.d/qubes-r4.list
 etc/apt/trusted.gpg.d/qubes-archive-keyring.gpg
 etc/dconf/db/local.d/dpi

diff --git a/package-managers/Makefile b/package-managers/Makefile
@@ -59,6 +59,8 @@ install-apt:
 		$(DESTDIR)$(APTCONFDIR)/apt.conf.d/70no-unattended
 	install -D -m 0644 apt-conf-10no-cache \
 		$(DESTDIR)$(APTCONFDIR)/apt.conf.d/10no-cache
+	install -D -m 0644 apt-conf-41error-on-any \
+		$(DESTDIR)$(APTCONFDIR)/apt.conf.d/41error-on-any
 
 install-dnf: install-rpm
 	install -D -m 0644 dnf-qubes-hooks.py \

diff --git a/package-managers/apt-conf-41error-on-any b/package-managers/apt-conf-41error-on-any
@@ -0,0 +1 @@
+APT::Update::Error-Mode "any";