summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorNate House nathan.house@rackspace.com <>2014-02-03 16:03:14 -0600
committerNate House nathan.house@rackspace.com <>2014-02-03 16:03:14 -0600
commita9e4009ae7221ea167b3e1083a887564483e0350 (patch)
treea370bd47399b1517c21b89d68aefd5afc15c5418 /setup.py
parent4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff)
parent3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff)
downloadvyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz
vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip
Fix merge conflict
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 08a8d771..b0766970 100755
--- a/setup.py
+++ b/setup.py
@@ -136,7 +136,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,