diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-20 21:26:34 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-20 21:26:34 +0200 |
| commit | cec9de20b8f542560293cc2c9c5d282fcce6346a (patch) | |
| tree | c3cf43e8b7bfcf92ef7eabe643910ccb6f833ba2 | |
| parent | 85f40a45fe7b69075f031fc5a0d1cf5d139f529d (diff) | |
Fix previous.
| -rwxr-xr-x | cdist | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -795,6 +795,13 @@ class OSXTarget(Target): def unlock_keychain(self): self.command('security unlock-keychain -p %s %s' % (self.osx_keychain_password, self.osx_keychain_file)) + def _copy_packages(self, tree, packages, output_dir): + for p in packages: + dest = os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))) + copyfile(p, dest) + if os.path.exists(p + ".id"): + copyfile(p + ".id", dest + ".id") + def _cscript_package_and_notarize(self, tree, options, notarize): """ Call package() in the cscript and notarize the .dmgs that are returned, if notarize == True @@ -840,13 +847,6 @@ class OSXSingleTarget(OSXTarget): self.set('MACOSX_DEPLOYMENT_TARGET', self.deployment) self.set('CCACHE_BASEDIR', self.directory) - def _copy_packages(self, tree, packages, output_dir): - for p in packages: - dest = os.path.join(output_dir, os.path.basename(devel_to_git(tree.git_commit, p))) - copyfile(p, dest) - if os.path.exists(p + ".id"): - copyfile(p + ".id", dest + ".id") - @Target.ccache.setter def ccache(self, v): Target.ccache.fset(self, v) |
