From 27e4752ea9fc8b9a6bc3bcdb6bc6c004e4014c4d Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Sun, 10 May 2015 20:22:46 +0200
Subject: [PATCH] [util-iso] set a flag for custom pacman.conf

---
 lib/util-iso.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 95e44a1..e076b76 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -490,6 +490,16 @@ check_plymouth(){
 	done
 }
 
+check_custom_pacman_conf(){
+	if [[ -f pacman-${pacman_conf_arch}.conf ]]; then
+		pacman_conf="pacman-${pacman_conf_arch}.conf"
+		is_custom_pac_conf=true
+	else
+		pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
+		is_custom_pac_conf=false
+	fi
+}
+
 # $1: profile
 load_profile(){
 	msg3 "Profile: [$1]"
@@ -504,11 +514,9 @@ load_profile(){
 	custom=${packages_custom#*-}
 	custom=${custom,,}
 	iso_file="${iso_name}-${custom}-${dist_release}-${arch}.iso"
-	if [[ -f pacman-${pacman_conf_arch}.conf ]]; then
-		pacman_conf="pacman-${pacman_conf_arch}.conf"
-	else
-		pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
-	fi
+
+	check_custom_pacman_conf
+
 	create_args+=(-C ${pacman_conf})
 	work_dir=${chroots_iso}/$1/${arch}
 
@@ -592,7 +600,7 @@ build_images(){
 	fi
 	make_isolinux
 	make_isomounts
-	[[ -n ${keep_repos} ]] && clean_pacman_conf "${work_dir}/root-image"
+	${is_custom_pac_conf} && clean_pacman_conf "${work_dir}/root-image"
 	msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer}) minutes"
 }