[neon/forks/ubuntu-release-upgrader/Neon/unstable_jammy] /: fix pre-build proper this time

[Harald Sitter]

Git commit 057c81844bd57e9982a093beface12265de88fb8 by Harald Sitter.
Committed on 26/04/2022 at 18:15.
Pushed by sitter into branch 'Neon/unstable_jammy'.

fix pre-build proper this time

(I think)

turns out the aforementioned error was because of the default release we
forcefully set via a config. we do this for tooling reasons, but it gets in
the way of the demotions helper, so delete the config first. the config
shouldn't be necessary anymore at this point in the contianer lifetime

M  +4    -2    pre-build.sh

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/commit/057c81844bd57e9982a093beface12265de88fb8

diff --git a/pre-build.sh b/pre-build.sh
index df6c81bd..1e9ecb85 100755
--- a/pre-build.sh
+++ b/pre-build.sh
@@ -5,8 +5,10 @@ set -ex
 # The testsuite has a sad if you're in a non-UTF-8 locale:
 export LANG='C.UTF-8'
 
-sed -i 's/# deb-src/deb-src/g' /etc/apt/sources.list
-apt update
+# Drop the Default-Release config. It'll screw up the demotions helper, which
+# will configure apt to use various releases. Default-Release gets in the way
+# of that.
+rm -f /etc/apt/apt.conf.d/99-default
 
 # Install for neon. we run this during build
 apt install -y apt-btrfs-snapshot parsewiki python3-feedparser python3-mock xvfb gir1.2-gtk-3.0 python3-nose