diff options
author | Dimitri John Ledkov <dimitri.ledkov@canonical.com> | 2014-07-23 16:48:14 +0100 |
---|---|---|
committer | Dimitri John Ledkov <dimitri.ledkov@canonical.com> | 2014-07-23 16:48:14 +0100 |
commit | 6327e159f475ca4dcd97d1c6feea5f747090c41d (patch) | |
tree | 22f5924191bc3938e3c58bab6635be25c0375eb6 | |
parent | ee4a64ecad554901a46bf8c8d2fb81f816a91818 (diff) | |
download | vyos-cloud-init-6327e159f475ca4dcd97d1c6feea5f747090c41d.tar.gz vyos-cloud-init-6327e159f475ca4dcd97d1c6feea5f747090c41d.zip |
fix ups
-rwxr-xr-x | packages/debian/rules | 2 | ||||
-rwxr-xr-x | setup.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/debian/rules b/packages/debian/rules index c1344e60..d3409c7e 100755 --- a/packages/debian/rules +++ b/packages/debian/rules @@ -4,7 +4,7 @@ DEB_PYTHON2_MODULE_PACKAGES = cloud-init INIT_SYSTEM ?= upstart,systemd %: - dh $@ --with python2,systemd --build-system pybuild + dh $@ --with python2,systemd --buildsystem pybuild override_dh_install: dh_install @@ -93,13 +93,13 @@ class InitsysInstallData(install): def initialize_options(self): install.initialize_options(self) - self.init_system = None + self.init_system = "" def finalize_options(self): install.finalize_options(self) - if self.init_systems and isinstance(self.init_systems, str): - self.init_systems = self.init_systems.split(",") + if self.init_system and isinstance(self.init_system, str): + self.init_system = self.init_system.split(",") if len(self.init_system) == 0: raise DistutilsArgError(("You must specify one of (%s) when" @@ -110,7 +110,7 @@ class InitsysInstallData(install): raise DistutilsArgError( "Invalid --init-system: %s" % (','.join(bad))) - for sys in self.init_systems: + for sys in self.init_system: print("adding %s: %s" % (sys, str(INITSYS_ROOTS[sys]))) self.distribution.data_files.append( (INITSYS_ROOTS[sys], INITSYS_FILES[sys])) |