From dabed2b92fe49dd5b88dd942a7dd26a9e4477d3d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 29 May 2020 11:00:30 +0200
Subject: update-archlinux32-package: error out if `make olddefconfig` did not
 finish

---
 update-archlinux32-package | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'update-archlinux32-package')

diff --git a/update-archlinux32-package b/update-archlinux32-package
index fd0b6e2..4f3b2b7 100755
--- a/update-archlinux32-package
+++ b/update-archlinux32-package
@@ -469,8 +469,9 @@ case ${update_path} in
         /^arch=[^#]*any/!{
           /^arch=(/s/(/(i486 i686 pentium4 /
         }
-        /^\s*cp .\+ \.config\s$/ a make oldconfig
-        s/^}$/return 1\n\0/
+        /^\s*cp .\+ \.config\s*$/ a make olddefconfig \
+        mv .config .processed-config \
+        return 1
       '"'"' PKGBUILD
     ' < \
       "${git_repo_path}/${repo}/${pkgname}/PKGBUILD"
@@ -484,9 +485,9 @@ case ${update_path} in
         else
           CARCH=${config_name#config.} makepkg -fcrs --asdeps --noconfirm
         fi
-        mv src/${_srcname}/.config ${config_name}
+        mv src/${_srcname}/.processed-config ${config_name} || exit $?
       done
-    '
+    ' || exit $?
     for config_name in ${config_names}; do
       scp "arch32-test:${pkgname}/${config_name}" "${git_repo_path}/${repo}/${pkgname}/"
     done
-- 
cgit v1.2.3-70-g09d2