Merge pull request #204 from AleksanderBobinski/bugfix/stale_database

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

src/apply.bash

@@ -212,6 +212,16 @@ function AconfApply() {
 
 	LogLeave # Installing priority files
 
+	if LC_ALL=C "$PACMAN" 2>&1 | grep --extended-regexp --only-matching 'database file for [a-z]+ does not exist'
+	then
+		Log 'The pacman local package database is internally inconsistent. Perform a full refresh and system upgrade now?\n'
+		Confirm ''
+
+		LogEnter 'Performing a full refresh and system upgrade...\n'
+		sudo "$PACMAN" --sync --refresh --sysupgrade
+		LogLeave
+	fi
+
 	#
 	# Apply packages
 	#

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")"
 				;;

test/t/t-2_apply-1_missing_pacman_db.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+source ./lib.bash
+
+TestIntegrationOnly
+
+# Test recovery from missing pacman databases.
+
+TestPhase_Setup ###############################################################
+command sudo rm -rf /var/lib/pacman/sync
+TestCreatePackage test-package native
+TestAddConfig AddPackage test-package
+
+TestPhase_Run #################################################################
+AconfApply
+
+TestPhase_Check ###############################################################
+TestExpectPacManLog <<EOF
+--sync test-package
+EOF
+
+TestDone ######################################################################