saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

setup.py: fix "invalid command name" error from distutils.dist for

Browse source 
write-salt-ssh-packaging-file and write-salt-version
This commit is contained in:
Haim Daniel 2015-03-09 08:03:38 +02:00
parent 33ce399f6b
commit 178b61033d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
setup.py
View file

@ -137,6 +137,7 @@ def _parse_requirements_file(requirements_file):
class WriteSaltVersion(Command): class WriteSaltVersion(Command):
description = 'Write salt\'s hardcoded version file' description = 'Write salt\'s hardcoded version file'
user_options = []
def initialize_options(self): def initialize_options(self):
pass pass
@ -164,6 +165,7 @@ class WriteSaltVersion(Command):
class WriteSaltSshPackaingFile(Command): class WriteSaltSshPackaingFile(Command):
description = 'Write salt\'s ssh packaging file' description = 'Write salt\'s ssh packaging file'
user_options = []
def initialize_options(self): def initialize_options(self):
pass pass
@ -188,7 +190,7 @@ class Sdist(sdist):
def make_release_tree(self, base_dir, files): def make_release_tree(self, base_dir, files):
if self.distribution.ssh_packaging: if self.distribution.ssh_packaging:
self.distribution.salt_ssh_packaging_file = PACKAGED_FOR_SALT_SSH_FILE 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)) self.filelist.files.append(os.path.basename(PACKAGED_FOR_SALT_SSH_FILE))
sdist.make_release_tree(self, base_dir, files) sdist.make_release_tree(self, base_dir, files)
@ -198,7 +200,7 @@ class Sdist(sdist):
self.distribution.salt_version_hardcoded_path = os.path.join( self.distribution.salt_version_hardcoded_path = os.path.join(
base_dir, 'salt', '_version.py' base_dir, 'salt', '_version.py'
) )
self.run_command('write-salt-version') self.run_command('write_salt_version')
def make_distribution(self): def make_distribution(self):
sdist.make_distribution(self) sdist.make_distribution(self)
@ -385,7 +387,7 @@ class Build(build):
# ahead and write our install time python modules. # ahead and write our install time python modules.
# Write the hardcoded salt version module salt/_version.py # 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 # Write the system paths file
system_paths_file_path = os.path.join( system_paths_file_path = os.path.join(
@ -605,8 +607,8 @@ class SaltDistribution(distutils.dist.Distribution):
'build': Build, 'build': Build,
'sdist': Sdist, 'sdist': Sdist,
'install': Install, 'install': Install,
'write-salt-version': WriteSaltVersion, 'write_salt_version': WriteSaltVersion,
'write-salt-ssh-packaging-file': WriteSaltSshPackaingFile}) 'write_salt_ssh_packaging_file': WriteSaltSshPackaingFile})
if not IS_WINDOWS_PLATFORM: if not IS_WINDOWS_PLATFORM:
self.cmdclass.update({'sdist': CloudSdist, self.cmdclass.update({'sdist': CloudSdist,
'install_lib': InstallLib}) 'install_lib': InstallLib})