From 53617818ddcdc5451d7549588e4a84999e3781d9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 28 Dec 2020 20:23:09 +0100 Subject: [PATCH] Try to fix keychain unlocking. --- cdist | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cdist b/cdist index 7576f4c..f5c7249 100755 --- a/cdist +++ b/cdist @@ -775,9 +775,8 @@ class OSXTarget(Target): def command(self, c): command('%s %s' % (self.variables_string(False), c)) - def build(self, *a, **k): + def unlock_keychain(self): self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file)) - return super().build(*a, **k) class OSXSingleTarget(OSXTarget): @@ -813,6 +812,7 @@ class OSXSingleTarget(OSXTarget): def package(self, project, checkout, output_dir, options, no_notarize): tree = self.build(project, checkout, options) tree.add_defaults(options) + self.unlock_keychain() p = self._build_packages(tree, options) for x in p: if not isinstance(x, tuple): @@ -841,6 +841,7 @@ class OSXUniversalTarget(OSXTarget): tree.build_dependencies(options) tree.build(options) + self.unlock_keychain() tree = globals.trees.get(project, checkout, self) with TreeDirectory(tree): if len(inspect.getfullargspec(tree.cscript['package']).args) == 3: -- 2.30.2