From b8244d24ea3503980241b0aa8d1a2e83abe85650 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Wed, 7 Jan 2015 01:28:32 +0000
Subject: [PATCH] The DB upgrade must be done after key initialization

---
 bootstrap-salt.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b0c489e..18ddbd1 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3380,14 +3380,14 @@ install_amazon_linux_ami_testing_post() {
 #
 install_arch_linux_stable_deps() {
 
-    if [ "$(which pacman-db-upgrade)" != "" ]; then
-        pacman-db-upgrade || return 1
-    fi
-
     if [ ! -f /etc/pacman.d/gnupg ]; then
         pacman-key --init && pacman-key --populate archlinux || return 1
     fi
 
+    if [ "$(which pacman-db-upgrade)" != "" ]; then
+        pacman-db-upgrade || return 1
+    fi
+
     if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
         pacman -Syyu --noconfirm --needed || return 1
     fi