From f72d30cf04308309bee4728fabb3e746236b2a98 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 24 Mar 2020 08:51:59 -0500
Subject: hscript: Execute +arch+ key before APK pkgdb init

Otherwise, the incorrect architecture's repositories are read
during the `apk update` operation.
---
 hscript/script_e.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'hscript')

diff --git a/hscript/script_e.cc b/hscript/script_e.cc
index 14d997d..775f93a 100644
--- a/hscript/script_e.cc
+++ b/hscript/script_e.cc
@@ -512,6 +512,11 @@ bool Script::execute() const {
         EXECUTE_OR_FAIL("signingkey", key)
     }
 
+    /* REQ: Runner.Execute.pkginstall.arch */
+    if(internal->arch) {
+        EXECUTE_OR_FAIL("arch", internal->arch)
+    }
+
     /* REQ: Runner.Execute.pkginstall.APKDB */
     output_info("internal", "initialising APK");
     if(opts.test(Simulate)) {
@@ -528,11 +533,6 @@ bool Script::execute() const {
     }
 #endif  /* HAS_INSTALL_ENV */
 
-    /* REQ: Runner.Execute.pkginstall.arch */
-    if(internal->arch) {
-        EXECUTE_OR_FAIL("arch", internal->arch)
-    }
-
     /* REQ: Runner.Execute.pkginstall */
     output_info("internal", "installing packages to target");
     if(opts.test(Simulate)) {
-- 
cgit v1.2.3-70-g09d2