src/apply.bash: Update pacman database before installing packages

On a fresh install it might happen that after priority files including the pacman config are installed, the pacman database is not up to date. : Applying configuration... :: Installing priority files... ::: Installing /etc/pacman.conf... :::: Done. ::: Done. :: Configuring packages... ::: Unpinning 4 unknown packages. warning: database file for 'community' does not exist (use '-Sy' to download) warning: database file for 'multilib' does not exist (use '-Sy' to download) This can later result in issues with finding the correct package during the "Apply packages" step. error: target not found: lib32-vulkan-intel error: target not found: lib32-vulkan-mesa-layers error: target not found: steam error: target not found: wine To avoid this issue ask the user if he wishes to do as pacman suggests and update the database before "Apply packages". To avoid an inconsistent state upgrade packages for which database entries were updated, in other words perform a system upgrade.
CyberShadow · Sep 27, 2024 · b01b05c · b01b05c
1 parent 1195f3a
commit b01b05c
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 14 deletions.
diff --git a/src/apply.bash b/src/apply.bash
@@ -212,6 +212,16 @@ function AconfApply() {
 
 	LogLeave # Installing priority files
 
+	if ! sudo "$PACMAN" --database --check --check
+	then
+		function Details() { Log "The pacman database is out of sync with the configuration, update?" ; }
+		Confirm Details
+
+		LogEnter 'Updating pacman database...\n'
+		sudo "$PACMAN" --sync --refresh --upgrades
+		LogLeave
+	fi
+
 	#
 	# Apply packages
 	#

diff --git a/test/t/mocks/pacman b/test/t/mocks/pacman
@@ -23,6 +23,10 @@ function pacman() {
 	local opt_groups=0
 	local opt_asdeps=false
 	local opt_asexplicit=false
+	local opt_refresh=false
+	local opt_upgrades=false
+	local opt_db_check=false
+	local opt_db_sync_check=false
 
 	local arg
 	for arg in "$@"
@@ -64,6 +68,20 @@ function pacman() {
 			--asexplicit)
 				opt_asexplicit=true
 				;;
+			--refresh)
+				opt_refresh=true
+				;;
+			--upgrades)
+				opt_upgrades=true
+				;;
+			--check)
+				if $opt_db_check
+				then
+					opt_db_sync_check=true
+				else
+					opt_db_check=true
+				fi
+				;;
 			-*)
 				FatalError 'Unknown mocked pacman switch %s\n' "$(Color Y "$arg")"
 				;;
@@ -244,19 +262,24 @@ function pacman() {
 			fi
 			;;
 		database)
-			local package
-			for package in "${args[@]}"
-			do
-				if $opt_asdeps
-				then
-					printf orphan > "$test_data_dir"/installed-packages/"$package"/inst_as
-				elif $opt_asexplicit
-				then
-					printf explicit > "$test_data_dir"/installed-packages/"$package"/inst_as
-				else
-					FatalError 'Mocked pacman --database without --asdeps/--asexplicit\n'
-				fi
-			done
+			if $opt_db_sync_check
+			then
+				exit_code=1
+			else
+				local package
+				for package in "${args[@]}"
+				do
+					if $opt_asdeps
+					then
+						printf orphan > "$test_data_dir"/installed-packages/"$package"/inst_as
+					elif $opt_asexplicit
+					then
+						printf explicit > "$test_data_dir"/installed-packages/"$package"/inst_as
+					else
+						FatalError 'Mocked pacman --database without --asdeps/--asexplicit\n'
+					fi
+				done
+			fi
 			echo pacman "$@" >> "$test_data_dir"/pacman.log
 			;;
 		remove)

diff --git a/test/t/t-2_apply-1_packages-1_new.sh b/test/t/t-2_apply-1_packages-1_new.sh
@@ -12,6 +12,8 @@ AconfApply
 
 TestPhase_Check ###############################################################
 TestExpectPacManLog <<EOF
+--database --check --check
+--sync --refresh --upgrades
 --sync test-package
 EOF
 

diff --git a/test/t/t-2_apply-1_packages-2_missing.sh b/test/t/t-2_apply-1_packages-2_missing.sh
@@ -11,6 +11,8 @@ AconfApply
 
 TestPhase_Check ###############################################################
 TestExpectPacManLog <<EOF
+--database --check --check
+--sync --refresh --upgrades
 --database --asdeps test-package
 --remove test-package
 EOF

diff --git a/test/t/t-2_apply-1_packages-3_unpinned.sh b/test/t/t-2_apply-1_packages-3_unpinned.sh
@@ -12,6 +12,8 @@ AconfApply
 
 TestPhase_Check ###############################################################
 TestExpectPacManLog <<EOF
+--database --check --check
+--sync --refresh --upgrades
 --database --asexplicit test-package
 EOF
 

diff --git a/test/t/t-2_apply-1_packages-4_orphan.sh b/test/t/t-2_apply-1_packages-4_orphan.sh
@@ -14,6 +14,8 @@ AconfApply
 
 TestPhase_Check ###############################################################
 TestExpectPacManLog <<EOF
+--database --check --check
+--sync --refresh --upgrades
 --remove test-orphan-package
 EOF
 

diff --git a/test/t/t-2_apply-1_packages-5_ignore.sh b/test/t/t-2_apply-1_packages-5_ignore.sh
@@ -12,6 +12,9 @@ TestPhase_Run #################################################################
 AconfApply
 
 TestPhase_Check ###############################################################
-TestExpectPacManLog < /dev/null
+TestExpectPacManLog <<EOF
+--database --check --check
+--sync --refresh --upgrades
+EOF
 
 TestDone ######################################################################
diff --git a/test/t/t-5_helpers-5_addpackagegroup.sh b/test/t/t-5_helpers-5_addpackagegroup.sh
@@ -12,6 +12,8 @@ AconfApply
 
 TestPhase_Check ###############################################################
 TestExpectPacManLog <<EOF
+--database --check --check
+--sync --refresh --upgrades
 --sync test-package
 EOF