summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-07-06 14:13:19 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-07-06 14:13:19 -0700
commite7095a1b19e849c530650d2d71edf8b28d30f1d1 (patch)
tree37f1c4acd3ea891c1e7a60bcd9dd8aa8c7ca1e0c
parent95711130af22f1d597aa0ab6b5a39d0af16f8a28 (diff)
downloadvyos-cloud-init-e7095a1b19e849c530650d2d71edf8b28d30f1d1.tar.gz
vyos-cloud-init-e7095a1b19e849c530650d2d71edf8b28d30f1d1.zip
Fix the initsys variable, setuptools/distools will automatically assign
to a variable of the name 'init_system' instead due to the param name being 'init-system'.
-rwxr-xr-xsetup.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/setup.py b/setup.py
index 458d1a9e..06b897a5 100755
--- a/setup.py
+++ b/setup.py
@@ -91,18 +91,18 @@ class InitsysInstallData(install):
def initialize_options(self):
install.initialize_options(self)
- self.initsys = None
+ self.init_system = None
def 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(
("You must specify one of (%s) when"
" specifying a init system!") % (", ".join(INITSYS_TYPES))
)
- elif self.initsys:
- self.distribution.data_files.append((INITSYS_ROOTS[self.initsys],
- INITSYS_FILES[self.initsys]))
+ elif self.init_system:
+ self.distribution.data_files.append((INITSYS_ROOTS[self.init_system],
+ INITSYS_FILES[self.init_system]))
# Force that command to reinitalize (with new file list)
self.distribution.reinitialize_command('install_data', True)