more pythonic spaces - no real change

[nodemanager.git] / initscript.py

diff --git a/initscript.py b/initscript.py
index 0876abb..29acd2e 100644 (file)
--- a/initscript.py
+++ b/initscript.py
@@ -5,11 +5,11 @@ import logger
 
 class Initscript:
 
-    def __init__ (self, name):
-        self.name=name
+    def __init__(self, name):
+        self.name = name
         self.initscript = ''
 
-    def configure (self, rec):
+    def configure(self, rec):
 #        logger.log("Initscript.configure")
         new_initscript = rec['initscript']
         if new_initscript != self.initscript:
@@ -18,7 +18,7 @@ class Initscript:
             #self.initscriptchanged = True
             self.refresh_slice_vinit()
 
-    def install_and_enable_vinit (self):
+    def install_and_enable_vinit(self):
         "prepare sliver rootfs init and systemd so the vinit service kicks in"
         # the fact that systemd attempts to run old-style services 
         # says we should do either one or the other and not both
@@ -26,48 +26,54 @@ class Initscript:
         # which is not what we've seen starting with f18
         # so we try for a systemd system, and if it fails it means 
         # one of the dir does not exist and so we are dealing with an init-based rootfs
-        try:    self.install_and_enable_vinit_for_systemd ()
-        except: self.install_and_enable_vinit_for_init ()
+        try:
+            self.install_and_enable_vinit_for_systemd ()
+        except:
+            self.install_and_enable_vinit_for_init ()
 
     # unconditionnally install and enable the generic vinit script
     # mimicking chkconfig for enabling the generic vinit script
     # this is hardwired for runlevel 3
-    def install_and_enable_vinit_for_init (self):
-        "suitable for init-based VMs"
-        vinit_source="/usr/share/NodeManager/sliver-initscripts/vinit"
-        vinit_script="/vservers/%s/etc/rc.d/init.d/vinit"%self.name
-        enable_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name
-        enable_target="../init.d/vinit"
+    def install_and_enable_vinit_for_init(self):
+        """
+        suitable for init-based VMs
+        """
+        vinit_source = "/usr/share/NodeManager/sliver-initscripts/vinit"
+        vinit_script = "/vservers/%s/etc/rc.d/init.d/vinit"%self.name
+        enable_link = "/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name
+        enable_target = "../init.d/vinit"
         # install in sliver
-        code=file(vinit_source).read()
-        if tools.replace_file_with_string(vinit_script,code,chmod=0755):
-            logger.log("Initscript: %s: installed generic vinit rc script"%self.name)
+        code = file(vinit_source).read()
+        if tools.replace_file_with_string(vinit_script, code, chmod=0755):
+            logger.log("Initscript: %s: installed generic vinit rc script" % self.name)
         # create symlink for runlevel 3
         if not os.path.islink(enable_link):
             try:
-                logger.log("Initscript: %s: creating runlevel3 symlink %s"%(self.name,enable_link))
-                os.symlink(enable_target,enable_link)
+                logger.log("Initscript: %s: creating runlevel3 symlink %s" % (self.name,enable_link))
+                os.symlink(enable_target, enable_link)
             except:
-                logger.log_exc("Initscript failed to create runlevel3 symlink %s"%enable_link,name=self.name)
+                logger.log_exc("Initscript failed to create runlevel3 symlink %s" % enable_link, name=self.name)
 
     # very similar but with systemd unit files - we target 'multi-user' in this context
     def install_and_enable_vinit_for_systemd(self):
-        "suitable for systemd-based VMs"
-        vinit_source="/usr/share/NodeManager/sliver-systemd/vinit.service"
-        vinit_unit_file="/vservers/%s/usr/lib/systemd/system/vinit.service"%self.name
-        enable_link="/vservers/%s/etc/systemd/system/multi-user.target.wants/vinit.service"%self.name
-        enable_target="/usr/lib/systemd/system/vinit.service"
+        """
+        suitable for systemd-based VMs
+        """
+        vinit_source = "/usr/share/NodeManager/sliver-systemd/vinit.service"
+        vinit_unit_file = "/vservers/%s/usr/lib/systemd/system/vinit.service"%self.name
+        enable_link = "/vservers/%s/etc/systemd/system/multi-user.target.wants/vinit.service"%self.name
+        enable_target = "/usr/lib/systemd/system/vinit.service"
         # install in sliver
-        code=file(vinit_source).read()
-        if tools.replace_file_with_string(vinit_unit_file,code,chmod=0755):
-            logger.log("Initscript: %s: installed vinit.service unit file"%self.name)
+        code = file(vinit_source).read()
+        if tools.replace_file_with_string(vinit_unit_file, code, chmod=0755):
+            logger.log("Initscript: %s: installed vinit.service unit file" % self.name)
         # create symlink for enabling this unit
         if not os.path.islink(enable_link):
             try:
-                logger.log("Initscript: %s: creating enabling symlink %s"%(self.name,enable_link))
-                os.symlink(enable_target,enable_link)
+                logger.log("Initscript: %s: creating enabling symlink %s" % (self.name, enable_link))
+                os.symlink(enable_target, enable_link)
             except:
-                logger.log_exc("Initscript failed to create enabling symlink %s"%enable_link,name=name)
+                logger.log_exc("Initscript failed to create enabling symlink %s" % enable_link,name=name)
 
 
 #ln -s '/usr/lib/systemd/system/vinit.service' '/etc/systemd/system/multi-user.target.wants/vinit.service'