From 178b61033d1ee54df77386086fa953db4f5c2491 Mon Sep 17 00:00:00 2001 From: Haim Daniel Date: Mon, 9 Mar 2015 08:03:38 +0200 Subject: [PATCH] setup.py: fix "invalid command name" error from distutils.dist for write-salt-ssh-packaging-file and write-salt-version --- setup.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index d7e9c6ed732..4e3d9252d52 100755 --- a/setup.py +++ b/setup.py @@ -137,6 +137,7 @@ def _parse_requirements_file(requirements_file): class WriteSaltVersion(Command): description = 'Write salt\'s hardcoded version file' + user_options = [] def initialize_options(self): pass @@ -164,6 +165,7 @@ class WriteSaltVersion(Command): class WriteSaltSshPackaingFile(Command): description = 'Write salt\'s ssh packaging file' + user_options = [] def initialize_options(self): pass @@ -188,7 +190,7 @@ class Sdist(sdist): def make_release_tree(self, base_dir, files): if self.distribution.ssh_packaging: self.distribution.salt_ssh_packaging_file = PACKAGED_FOR_SALT_SSH_FILE - self.run_command('write-salt-ssh-packaging-file') + self.run_command('write_salt_ssh_packaging_file') self.filelist.files.append(os.path.basename(PACKAGED_FOR_SALT_SSH_FILE)) sdist.make_release_tree(self, base_dir, files) @@ -198,7 +200,7 @@ class Sdist(sdist): self.distribution.salt_version_hardcoded_path = os.path.join( base_dir, 'salt', '_version.py' ) - self.run_command('write-salt-version') + self.run_command('write_salt_version') def make_distribution(self): sdist.make_distribution(self) @@ -385,7 +387,7 @@ class Build(build): # ahead and write our install time python modules. # Write the hardcoded salt version module salt/_version.py - self.run_command('write-salt-version') + self.run_command('write_salt_version') # Write the system paths file system_paths_file_path = os.path.join( @@ -605,8 +607,8 @@ class SaltDistribution(distutils.dist.Distribution): 'build': Build, 'sdist': Sdist, 'install': Install, - 'write-salt-version': WriteSaltVersion, - 'write-salt-ssh-packaging-file': WriteSaltSshPackaingFile}) + 'write_salt_version': WriteSaltVersion, + 'write_salt_ssh_packaging_file': WriteSaltSshPackaingFile}) if not IS_WINDOWS_PLATFORM: self.cmdclass.update({'sdist': CloudSdist, 'install_lib': InstallLib})