From 6327e159f475ca4dcd97d1c6feea5f747090c41d Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 23 Jul 2014 16:48:14 +0100 Subject: fix ups --- packages/debian/rules | 2 +- 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 diff --git a/setup.py b/setup.py index 1a6d0cf4..8b1e6ece 100755 --- a/setup.py +++ b/setup.py @@ -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])) -- cgit v1.2.3