From 20c0a158565291aeb50172b9517642ae8fdccdd3 Mon Sep 17 00:00:00 2001
From: Sertonix <sertonix@posteo.net>
Date: Thu, 28 Mar 2024 12:50:53 +0100
Subject: [PATCH] functions.sh: fix ABUILD_USERDIR overwrite in ABUILD_CONF

---
 abuild.in       | 1 +
 functions.sh.in | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/abuild.in b/abuild.in
index 094e97c..bc3867d 100644
--- a/abuild.in
+++ b/abuild.in
@@ -2633,6 +2633,7 @@ rootbld() {
 		--setenv CARCH "$CARCH" \
 		--setenv HOME "$HOME" \
 		--setenv REPODEST "$REPODEST" \
+		--setenv ABUILD_USERDIR "$ABUILD_USERDIR" \
 		${ABUILD_BOOTSTRAP:+--setenv ABUILD_BOOTSTRAP "$ABUILD_BOOTSTRAP"} \
 		--setenv SOURCE_DATE_EPOCH "$SOURCE_DATE_EPOCH" \
 		--setenv ABUILD_LAST_COMMIT "$ABUILD_LAST_COMMIT" \
diff --git a/functions.sh.in b/functions.sh.in
index 4d029f8..9fc79e1 100644
--- a/functions.sh.in
+++ b/functions.sh.in
@@ -98,11 +98,11 @@ readconfig() {
 	[ -n "${USE_COLORS+x}" ] && _USE_COLORS="$USE_COLORS"
 	[ -n "${USE_CCACHE+x}" ] && _USE_CCACHE="$USE_CCACHE"
 	: ${ABUILD_DEFCONF:=${ABUILD_SHAREDIR:-$sharedir}/default.conf}
+	[ -f "$ABUILD_DEFCONF" ] && . "$ABUILD_DEFCONF"
 	: ${ABUILD_CONF:=$sysconfdir/abuild.conf}
+	[ -f "$ABUILD_CONF" ] && . "$ABUILD_CONF"
 	: ${ABUILD_USERDIR:=$HOME/.abuild}
 	: ${ABUILD_USERCONF:=$ABUILD_USERDIR/abuild.conf}
-	[ -f "$ABUILD_DEFCONF" ] && . "$ABUILD_DEFCONF"
-	[ -f "$ABUILD_CONF" ] && . "$ABUILD_CONF"
 	[ -f "$ABUILD_USERCONF" ] && . "$ABUILD_USERCONF"
 	APORTSDIR=${_APORTSDIR-$APORTSDIR}