From 42ceee7871a425dbc0dd1ce1368a6c736a7933cc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 30 Dec 2020 01:35:10 +0100 Subject: [PATCH] Reverse the sense of a bunch of notarize variables. --- cdist | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cdist b/cdist index c28825e..f7094a0 100755 --- a/cdist +++ b/cdist @@ -438,7 +438,7 @@ class Target(object): for p in packages: copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p)))) - def package(self, project, checkout, output_dir, options, no_notarize): + def package(self, project, checkout, output_dir, options, notarize): tree = self.build(project, checkout, options) tree.add_defaults(options) p = self._build_packages(tree, options) @@ -809,7 +809,7 @@ class OSXSingleTarget(OSXTarget): self.set('CC', '"ccache gcc"') self.set('CXX', '"ccache g++"') - def package(self, project, checkout, output_dir, options, no_notarize): + def package(self, project, checkout, output_dir, options, notarize): tree = self.build(project, checkout, options) tree.add_defaults(options) self.unlock_keychain() @@ -817,7 +817,7 @@ class OSXSingleTarget(OSXTarget): for x in p: if not isinstance(x, tuple): raise Error('macOS packages must be returned from cscript as tuples of (dmg-filename, bundle-id)') - if not no_notarize: + if notarize: notarize_dmg(x[0], x[1]) self._copy_packages(tree, [x[0] for x in p], output_dir) @@ -827,7 +827,7 @@ class OSXUniversalTarget(OSXTarget): super(OSXUniversalTarget, self).__init__(directory) self.archs = archs - def package(self, project, checkout, output_dir, options, no_notarize): + def package(self, project, checkout, output_dir, options, notarize): sdk = config.get('osx_sdk') for a in self.archs: @@ -860,7 +860,7 @@ class SourceTarget(Target): def cleanup(self): rmtree(self.directory) - def package(self, project, checkout, output_dir, options, no_notarize): + def package(self, project, checkout, output_dir, options, notarize): tree = globals.trees.get(project, checkout, self) with TreeDirectory(tree): name = read_wscript_variable(os.getcwd(), 'APPNAME') @@ -1231,7 +1231,7 @@ def main(): output_dir = args.output makedirs(output_dir) - target.package(args.project, args.checkout, output_dir, get_command_line_options(args), args.no_notarize) + target.package(args.project, args.checkout, output_dir, get_command_line_options(args), not args.no_notarize) except Error as e: if target is not None and not args.keep: target.cleanup() -- 2.30.2