x/cloud-init
Code Issues Proposed changes

Fix the initsys variable, setuptools/distools will automatically assign

Browse Source 
to a variable of the name 'init_system' instead due to the param name being
'init-system'.
This commit is contained in:
Joshua Harlow
2012-07-06 14:13:19 -07:00
parent 833740407e
commit 26b36823a5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup.py
View File

@@ -91,18 +91,18 @@ class InitsysInstallData(install):
def initialize_options(self): def initialize_options(self):
install.initialize_options(self) install.initialize_options(self)
self.initsys = None self.init_system = None
def finalize_options(self): def finalize_options(self):
install.finalize_options(self) install.finalize_options(self)
if self.initsys and self.initsys not in INITSYS_TYPES: if self.init_system and self.init_system not in INITSYS_TYPES:
raise DistutilsArgError( raise DistutilsArgError(
("You must specify one of (%s) when" ("You must specify one of (%s) when"
" specifying a init system!") % (", ".join(INITSYS_TYPES)) " specifying a init system!") % (", ".join(INITSYS_TYPES))
) )
elif self.initsys: elif self.init_system:
self.distribution.data_files.append((INITSYS_ROOTS[self.initsys], self.distribution.data_files.append((INITSYS_ROOTS[self.init_system],
INITSYS_FILES[self.initsys])) INITSYS_FILES[self.init_system]))
# Force that command to reinitalize (with new file list) # Force that command to reinitalize (with new file list)
self.distribution.reinitialize_command('install_data', True) self.distribution.reinitialize_command('install_data', True)