archPackagesUpdate: use makechrootpkg instead of archbuild if install conflicts with base/base-devel are in sight

1 files changed, 22 insertions, 1 deletions

diff --git a/archPackagesUpdate b/archPackagesUpdate
index 869860c14..3e370006e 100755
--- a/archPackagesUpdate
+++ b/archPackagesUpdate
@@ -478,7 +478,28 @@ if ${aufRechenknecht}; then
 
     case "${arch}" in
       'any'|'i686'|'pentium4'|'x86_64')
-        archlinuxewe-${arch/any/x86_64}-build ${cleanChroot} -- -- ${log} ${checkMakepkg} --holdver
+        if [ -n "${cleanChroot}" ]; then
+          build_mode='archbuild'
+        elif sed -n '
+          /^conflicts=(/ {
+            :a
+            /)/ ! {
+              N
+              $! ba
+            }
+            p
+          }
+        ' PKGBUILD \
+        | grep -qwF "$(pacman -Qqg base base-devel)"; then
+          build_mode='makechrootpkg'
+        else
+          build_mode='archbuild'
+        fi
+        if [ "${build_mode}" = 'archbuild' ]; then
+          archlinuxewe-${arch/any/x86_64}-build ${cleanChroot} -- -- ${log} ${checkMakepkg} --holdver
+        else
+          makechrootpkg -r "/var/lib/archbuild/archlinuxewe-${arch/any/x86_64}" -- ${log} ${checkMakepkg} --holdver -f
+        fi
         err[${i}]=$?
         if [ ${err[${i}]} -eq 0 ] && [ "${arch}" != 'x86_64' ] && [ "${arch}" != 'any' ]; then
           {