Reverse the sense of a bunch of notarize variables.

[cdist.git] / cdist

diff --git a/cdist b/cdist
index f5c72497a6f490b85b04fef401ef544006398232..f7094a076f3b2688b18581f44112bb070818ff5a 100755 (executable)
--- 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)
@@ -728,7 +728,7 @@ class AppImageTarget(LinuxTarget):
         self.privileged = True
 
 
-def notarize(dmg, bundle_id):
+def notarize_dmg(dmg, bundle_id):
     p = subprocess.run(
         ['xcrun', 'altool', '--notarize-app', '-t', 'osx', '-f', dmg, '--primary-bundle-id', bundle_id, '-u', config.get('apple_id'), '-p', config.get('apple_password'), '--output-format', 'xml'],
         capture_output=True
@@ -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,8 +817,8 @@ 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:
-                notarize(x[0], x[1])
+            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:
@@ -844,11 +844,7 @@ class OSXUniversalTarget(OSXTarget):
         self.unlock_keychain()
         tree = globals.trees.get(project, checkout, self)
         with TreeDirectory(tree):
-            if len(inspect.getfullargspec(tree.cscript['package']).args) == 3:
-                packages = tree.call('package', tree.version, options)
-            else:
-                log_normal("Deprecated cscript package() method with no options parameter")
-                packages = tree.call('package', tree.version)
+            self._build_packages(tree, options)
             for p in packages:
                 copyfile(p, os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))))
 
@@ -864,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')
@@ -1235,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()