diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-03-24 08:51:59 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-03-24 08:52:42 -0500 |
| commit | f72d30cf04308309bee4728fabb3e746236b2a98 (patch) | |
| tree | 0e75abb253a7d03fa9560357cc8e50fdea132ee4 /hscript/script_e.cc | |
| parent | 188d00bf06c6b2dba2d5d9b75fb1fc05666dee68 (diff) | |
| download | horizon-f72d30cf04308309bee4728fabb3e746236b2a98.tar.gz horizon-f72d30cf04308309bee4728fabb3e746236b2a98.tar.bz2 horizon-f72d30cf04308309bee4728fabb3e746236b2a98.tar.xz horizon-f72d30cf04308309bee4728fabb3e746236b2a98.zip | |
hscript: Execute +arch+ key before APK pkgdb init
Otherwise, the incorrect architecture's repositories are read
during the `apk update` operation.
Diffstat (limited to 'hscript/script_e.cc')
| -rw-r--r-- | hscript/script_e.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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)) { |