diff options
author | Ben Howard <ben.howard@canonical.com> | 2014-01-24 14:20:54 -0700 |
---|---|---|
committer | Ben Howard <ben.howard@canonical.com> | 2014-01-24 14:20:54 -0700 |
commit | 85d8ec03ea4dd01d37b141390d1ae5c7d10e7052 (patch) | |
tree | a97ddb7f71d00e857dd718b4004f52638736c299 /setup.py | |
parent | 7079fac4646380db1e064a433d7843473bda1542 (diff) | |
parent | 4919cd124e57e82ecfcdaa9bfcbc051c719708e6 (diff) | |
download | vyos-cloud-init-85d8ec03ea4dd01d37b141390d1ae5c7d10e7052.tar.gz vyos-cloud-init-85d8ec03ea4dd01d37b141390d1ae5c7d10e7052.zip |
Rebasing on trunk
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -63,7 +63,7 @@ def tiny_p(cmd, capture=True): (out, err) = sp.communicate() ret = sp.returncode # pylint: disable=E1101 if ret not in [0]: - raise RuntimeError("Failed running %s [rc=%s] (%s, %s)" + raise RuntimeError("Failed running %s [rc=%s] (%s, %s)" % (cmd, ret, out, err)) return (out, err) @@ -102,7 +102,7 @@ class InitsysInstallData(install): " specifying a init system!") % (", ".join(INITSYS_TYPES))) elif self.init_system: self.distribution.data_files.append( - (INITSYS_ROOTS[self.init_system], + (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) @@ -134,7 +134,7 @@ setuptools.setup(name='cloud-init', [f for f in glob('doc/examples/seed/*') if is_f(f)]), ], install_requires=read_requires(), - cmdclass = { + cmdclass={ # Use a subclass for install that handles # adding on the right init system configuration files 'install': InitsysInstallData, |