python3 + pep8

diff --git a/NodeUpdate.py b/NodeUpdate.py
index fccfcb3..fc123c4 100755 (executable)
--- a/NodeUpdate.py
+++ b/NodeUpdate.py
@@ -1,6 +1,4 @@
-#!/usr/bin/python2
-
-from __future__ import print_function
+#!/usr/bin/env python3

 
 import sys
 import os
 
 import sys
 import os


@@ -10,12 +8,12 @@ from random import Random
 from types import StringTypes
 
 from time import strftime
 from types import StringTypes
 
 from time import strftime

-TIMEFORMAT="%Y-%m-%d %H:%M:%S"
+TIMEFORMAT = "%Y-%m-%d %H:%M:%S"

 
 

-NODEUPDATE_PID_FILE= "/var/run/NodeUpdate.pid"
+NODEUPDATE_PID_FILE = "/var/run/NodeUpdate.pid"

 
 # variables for cron file creation
 
 # variables for cron file creation

-TARGET_SCRIPT = '(echo && date && echo && /usr/bin/NodeUpdate.py start) >>/var/log/NodeUpdate.log 2>&1'
+TARGET_SCRIPT = '(echo && date && echo && /usr/bin/NodeUpdate.py start) >> /var/log/NodeUpdate.log 2>&1'

 TARGET_DESC = 'Update node RPMs periodically'
 TARGET_USER = 'root'
 TARGET_SHELL = '/bin/bash'
 TARGET_DESC = 'Update node RPMs periodically'
 TARGET_USER = 'root'
 TARGET_SHELL = '/bin/bash'


@@ -38,27 +36,27 @@ PROXY_FILE = '/etc/planetlab/http_proxy'
 REBOOT_FLAG = '/etc/planetlab/update-reboot'
 
 # location of directory containing boot server ssl certs
 REBOOT_FLAG = '/etc/planetlab/update-reboot'
 
 # location of directory containing boot server ssl certs

-SSL_CERT_DIR='/mnt/cdrom/bootme/cacert/'
+SSL_CERT_DIR = '/mnt/cdrom/bootme/cacert/'

 
 # file containing the list of extensions this node has, each
 # correspond to a package group in yum repository.
 
 # file containing the list of extensions this node has, each
 # correspond to a package group in yum repository.

-# this is expected to be updated from the 'extensions tag' 
+# this is expected to be updated from the 'extensions tag'

 # through the 'extensions.php' nodeconfig script
 # through the 'extensions.php' nodeconfig script

-EXTENSIONS_FILE='/etc/planetlab/extensions'
+EXTENSIONS_FILE = '/etc/planetlab/extensions'

 
 # file containing a list of rpms that we should attempt to delete
 
 # file containing a list of rpms that we should attempt to delete

-# before updating everything else. This list is not removed with 
+# before updating everything else. This list is not removed with

 # 'yum remove', because that could accidently remove dependency rpms
 # that were not intended to be deleted.
 # 'yum remove', because that could accidently remove dependency rpms
 # that were not intended to be deleted.

-DELETE_RPM_LIST_FILE= '/etc/planetlab/delete-rpm-list'
+DELETE_RPM_LIST_FILE = '/etc/planetlab/delete-rpm-list'

 
 # ok, so the logic should be simple, just yum update the world
 
 # ok, so the logic should be simple, just yum update the world

-# however there are many cases in the real life where this 
+# however there are many cases in the real life where this

 # just does not work, because of a glitch somewhere
 # just does not work, because of a glitch somewhere

-# so, we force the update of crucial pkgs independently, as 
-# the whole group is sometimes too much to swallow 
+# so, we force the update of crucial pkgs independently, as
+# the whole group is sometimes too much to swallow

 # this one is builtin
 # this one is builtin

-CRUCIAL_PACKAGES_BUILTIN=[
+CRUCIAL_PACKAGES_BUILTIN = [

     'NodeUpdate',
     'nodemanager-lib',
     'nodemanager-lxc',
     'NodeUpdate',
     'nodemanager-lib',
     'nodemanager-lxc',


@@ -76,13 +74,18 @@ CRUCIAL_PACKAGES_OPTIONAL_PATHS = [
 ]
 
 # print out a message only if we are displaying output
 ]
 
 # print out a message only if we are displaying output

+
+

 def Message(*messages):
     if displayOutput:
         print(5*'*', strftime(TIMEFORMAT), *messages)
 
 # always print errors
 def Message(*messages):
     if displayOutput:
         print(5*'*', strftime(TIMEFORMAT), *messages)
 
 # always print errors

+
+

 def Error(*messages):
 def Error(*messages):

-    print(10*'!', strftime(TIMEFORMAT),*messages)
+    print(10*'!', strftime(TIMEFORMAT), *messages)
+

 
 class YumDnf:
     def __init__(self):
 
 class YumDnf:
     def __init__(self):


@@ -108,7 +111,7 @@ class YumDnf:
             sslcertdir = ""
         self.options = options
 
             sslcertdir = ""
         self.options = options
 

-    ########## one individual package
+    # one individual package

     def handle_package(self, package):
         if not self.is_packaged_installed(package):
             return self.do_package(package, "install")
     def handle_package(self, package):
         if not self.is_packaged_installed(package):
             return self.do_package(package, "install")


@@ -126,25 +129,31 @@ class YumDnf:
         Message("Invoking {}".format(cmd))
         return os.system(cmd) == 0
 
         Message("Invoking {}".format(cmd))
         return os.system(cmd) == 0
 

-    ########## update one group
+    # update one group

     def update_group(self, group):
         # it is important to invoke dnf group *upgrade* and not *update*
         # because the semantics of groups has changed within dnf
         overall = True
         if HAS_DNF:
     def update_group(self, group):
         # it is important to invoke dnf group *upgrade* and not *update*
         # because the semantics of groups has changed within dnf
         overall = True
         if HAS_DNF:

-            cmd = "{} {} -y group install {}".format(self.command, self.options, group)
+            cmd = "{} {} -y group install {}".format(
+                self.command, self.options, group)

             Message("Invoking {}".format(cmd))
             Message("Invoking {}".format(cmd))

-            if os.system(cmd) != 0: overall = False
-            cmd = "{} {} -y group upgrade {}".format(self.command, self.options, group)
+            if os.system(cmd) != 0:
+                overall = False
+            cmd = "{} {} -y group upgrade {}".format(
+                self.command, self.options, group)

             Message("Invoking {}".format(cmd))
             Message("Invoking {}".format(cmd))

-            if os.system(cmd) != 0: overall = False
+            if os.system(cmd) != 0:
+                overall = False

         else:
         else:

-            cmd = "{} {} -y groupinstall {}".format(self.command, self.options, group)
+            cmd = "{} {} -y groupinstall {}".format(
+                self.command, self.options, group)

             Message("Invoking {}".format(cmd))
             Message("Invoking {}".format(cmd))

-            if os.system(cmd) != 0: overall = False
+            if os.system(cmd) != 0:
+                overall = False

         return overall
 
         return overall
 

-    ########## update the whole system
+    # update the whole system

     def update_system(self):
         cmd = "{} {} -y update".format(self.command, self.options)
         Message("Invoking {}".format(cmd))
     def update_system(self):
         cmd = "{} {} -y update".format(self.command, self.options)
         Message("Invoking {}".format(cmd))


@@ -158,22 +167,24 @@ class YumDnf:
 # create an entry in /etc/cron.d so we run periodically.
 # we will be run once a day at a 0-59 minute random offset
 # into a 0-23 random hour
 # create an entry in /etc/cron.d so we run periodically.
 # we will be run once a day at a 0-59 minute random offset
 # into a 0-23 random hour

+
+

 def UpdateCronFile():
     try:
 def UpdateCronFile():
     try:

-        
-        randomMinute= Random().randrange(0, 59, 1);
-        randomHour= Random().randrange(0, 11, 1);
-        
-        f = open(CRON_FILE, 'w');
-        f.write("# {}\n".format(TARGET_DESC));
-        ### xxx is root aliased to the support mailing list ?
-        f.write("MAILTO={}\n".format(TARGET_USER));
-        f.write("SHELL={}\n".format(TARGET_SHELL));
+
+        randomMinute = Random().randrange(0, 59, 1)
+        randomHour = Random().randrange(0, 11, 1)
+
+        f = open(CRON_FILE, 'w')
+        f.write("# {}\n".format(TARGET_DESC))
+        # xxx is root aliased to the support mailing list ?
+        f.write("MAILTO={}\n".format(TARGET_USER))
+        f.write("SHELL={}\n".format(TARGET_SHELL))

         f.write("{} {},{} * * * {} {}\n\n"
         f.write("{} {},{} * * * {} {}\n\n"

-                .format (randomMinute, randomHour,
-                         randomHour + 12, TARGET_USER, TARGET_SCRIPT));
+                .format(randomMinute, randomHour,
+                        randomHour + 12, TARGET_USER, TARGET_SCRIPT))

         f.close()
         f.close()

-    
+

         print("Created new cron.d entry.")
     except:
         print("Unable to create cron.d entry.")
         print("Created new cron.d entry.")
     except:
         print("Unable to create cron.d entry.")


@@ -186,21 +197,20 @@ def RemoveCronFile():
         print("Deleted cron.d entry.")
     except:
         print("Unable to delete cron.d entry.")
         print("Deleted cron.d entry.")
     except:
         print("Unable to delete cron.d entry.")

-        

 
 
 class NodeUpdate:
 
     def __init__(self, doReboot):
         if self.CheckProxy():
 
 
 class NodeUpdate:
 
     def __init__(self, doReboot):
         if self.CheckProxy():

-            os.environ['http_proxy']= self.HTTP_PROXY
-            os.environ['HTTP_PROXY']= self.HTTP_PROXY
-        self.doReboot= doReboot
+            os.environ['http_proxy'] = self.HTTP_PROXY
+            os.environ['HTTP_PROXY'] = self.HTTP_PROXY
+        self.doReboot = doReboot

 
     def CheckProxy(self):
         Message("Checking existence of proxy config file...")
         if os.access(PROXY_FILE, os.R_OK) and os.path.isfile(PROXY_FILE):
 
     def CheckProxy(self):
         Message("Checking existence of proxy config file...")
         if os.access(PROXY_FILE, os.R_OK) and os.path.isfile(PROXY_FILE):

-            self.HTTP_PROXY= string.strip(file(PROXY_FILE,'r').readline())
+            self.HTTP_PROXY = string.strip(file(PROXY_FILE, 'r').readline())

             Message("Using proxy {}".format(self.HTTP_PROXY))
             return 1
         else:
             Message("Using proxy {}".format(self.HTTP_PROXY))
             return 1
         else:


@@ -220,8 +230,8 @@ class NodeUpdate:
         Message("Removing any existing reboot flags")
         self.ClearRebootFlag()
         if self.doReboot == 0:
         Message("Removing any existing reboot flags")
         self.ClearRebootFlag()
         if self.doReboot == 0:

-            Message("Ignoring any reboot flags set by RPMs");
-                    
+            Message("Ignoring any reboot flags set by RPMs")
+

         yum_dnf = YumDnf()
 
         # this of course is quite suboptimal, but proved to be safer
         yum_dnf = YumDnf()
 
         # this of course is quite suboptimal, but proved to be safer


@@ -242,7 +252,7 @@ class NodeUpdate:
             for package in crucial_packages:
                 yum_dnf.handle_package(package)
         except:
             for package in crucial_packages:
                 yum_dnf.handle_package(package)
         except:

-            
+

             pass
 
         Message("Updating PlanetLab group")
             pass
 
         Message("Updating PlanetLab group")


@@ -254,8 +264,8 @@ class NodeUpdate:
         Message("Checking for extra groups (extensions) to update")
         if os.access(EXTENSIONS_FILE, os.R_OK) and \
            os.path.isfile(EXTENSIONS_FILE):
         Message("Checking for extra groups (extensions) to update")
         if os.access(EXTENSIONS_FILE, os.R_OK) and \
            os.path.isfile(EXTENSIONS_FILE):

-            extensions_contents= file(EXTENSIONS_FILE).read()
-            extensions_contents= string.strip(extensions_contents)
+            extensions_contents = file(EXTENSIONS_FILE).read()
+            extensions_contents = string.strip(extensions_contents)

             if extensions_contents == "":
                 Message("No extra groups found in file.")
             else:
             if extensions_contents == "":
                 Message("No extra groups found in file.")
             else:


@@ -265,7 +275,7 @@ class NodeUpdate:
                     yum_dnf.update_group(group)
         else:
             Message("No extensions file found")
                     yum_dnf.update_group(group)
         else:
             Message("No extensions file found")

-            
+

         if os.access(REBOOT_FLAG, os.R_OK) and os.path.isfile(REBOOT_FLAG) and self.doReboot:
             Message("At least one update requested the system be rebooted")
             self.ClearRebootFlag()
         if os.access(REBOOT_FLAG, os.R_OK) and os.path.isfile(REBOOT_FLAG) and self.doReboot:
             Message("At least one update requested the system be rebooted")
             self.ClearRebootFlag()


@@ -286,40 +296,44 @@ class NodeUpdate:
         Message("Looking for RPMs to be deleted.")
         if os.access(DELETE_RPM_LIST_FILE, os.R_OK) and \
            os.path.isfile(DELETE_RPM_LIST_FILE):
         Message("Looking for RPMs to be deleted.")
         if os.access(DELETE_RPM_LIST_FILE, os.R_OK) and \
            os.path.isfile(DELETE_RPM_LIST_FILE):

-            rpm_list_contents= file(DELETE_RPM_LIST_FILE).read().strip()
+            rpm_list_contents = file(DELETE_RPM_LIST_FILE).read().strip()

 
             if rpm_list_contents == "":
                 Message("No RPMs listed in file to delete.")
                 return
 
 
             if rpm_list_contents == "":
                 Message("No RPMs listed in file to delete.")
                 return
 

-            rpm_list= string.split(rpm_list_contents)
-            
-            Message("Deleting RPMs from {}: {}".format(DELETE_RPM_LIST_FILE," ".join(rpm_list)))
+            rpm_list = string.split(rpm_list_contents)
+
+            Message("Deleting RPMs from {}: {}".format(
+                DELETE_RPM_LIST_FILE, " ".join(rpm_list)))

 
             # invoke them separately as otherwise one faulty (e.g. already uninstalled)
             # would prevent the other ones from uninstalling
             for rpm in rpm_list:
                 # is it installed
 
             # invoke them separately as otherwise one faulty (e.g. already uninstalled)
             # would prevent the other ones from uninstalling
             for rpm in rpm_list:
                 # is it installed

-                is_installed = os.system ("{} -q {}".format(RPM_PATH, rpm)) == 0
+                is_installed = os.system("{} -q {}".format(RPM_PATH, rpm)) == 0

                 if not is_installed:
                 if not is_installed:

-                    Message ("Ignoring rpm {} marked to delete, already uninstalled".format(rpm))
+                    Message(
+                        "Ignoring rpm {} marked to delete, already uninstalled".format(rpm))

                     continue
                 uninstalled = os.system("{} -ev {}".format(RPM_PATH, rpm)) == 0
                 if uninstalled:
                     continue
                 uninstalled = os.system("{} -ev {}".format(RPM_PATH, rpm)) == 0
                 if uninstalled:

-                    Message ("Successfully removed RPM {}".format(rpm))
+                    Message("Successfully removed RPM {}".format(rpm))

                     continue
                 else:
                     continue
                 else:

-                    Error("Unable to delete RPM {}, continuing. rc={}".format(rpm, uninstalled))
-            
+                    Error("Unable to delete RPM {}, continuing. rc={}".format(
+                        rpm, uninstalled))
+

         else:
             Message("No RPMs list file found.")
 
         else:
             Message("No RPMs list file found.")
 

+

 ##############################
 if __name__ == "__main__":
 
 ##############################
 if __name__ == "__main__":
 

-    # if we are invoked with 'start', display the output. 
-    # this is useful for running something silently 
-    # under cron and as a service (at startup), 
+    # if we are invoked with 'start', display the output.
+    # this is useful for running something silently
+    # under cron and as a service (at startup),

     # so the cron only outputs errors and doesn't
     # generate mail when it works correctly
 
     # so the cron only outputs errors and doesn't
     # generate mail when it works correctly
 


@@ -328,12 +342,12 @@ if __name__ == "__main__":
     # if we hit an rpm that requests a reboot, do it if this is
     # set to 1. can be turned off by adding noreboot to command line
     # option
     # if we hit an rpm that requests a reboot, do it if this is
     # set to 1. can be turned off by adding noreboot to command line
     # option

-    
+

     doReboot = 1
 
     if "start" in sys.argv or "display" in sys.argv:
         displayOutput = 1
     doReboot = 1
 
     if "start" in sys.argv or "display" in sys.argv:
         displayOutput = 1

-        Message ("\nTurning on messages")
+        Message("\nTurning on messages")

 
     if "noreboot" in sys.argv:
         doReboot = 0
 
     if "noreboot" in sys.argv:
         doReboot = 0


@@ -345,27 +359,25 @@ if __name__ == "__main__":
 
     if "removecron" in sys.argv:
         RemoveCronFile()
 
     if "removecron" in sys.argv:
         RemoveCronFile()

-        sys.exit(0)     
+        sys.exit(0)

 
 

-            

     # see if we are already running by checking the existance
     # of a PID file, and if it exists, attempting a test kill
     # to see if the process really does exist. If both of these
     # tests pass, exit.
     # see if we are already running by checking the existance
     # of a PID file, and if it exists, attempting a test kill
     # to see if the process really does exist. If both of these
     # tests pass, exit.

-    
+

     if os.access(NODEUPDATE_PID_FILE, os.R_OK):
     if os.access(NODEUPDATE_PID_FILE, os.R_OK):

-        pid= string.strip(file(NODEUPDATE_PID_FILE).readline())
-        if pid <> "":
+        pid = string.strip(file(NODEUPDATE_PID_FILE).readline())
+        if pid != "":

             if os.system("/bin/kill -0 {} > /dev/null 2>&1".format(pid)) == 0:
                 Message("It appears we are already running, exiting.")
                 sys.exit(1)
             if os.system("/bin/kill -0 {} > /dev/null 2>&1".format(pid)) == 0:
                 Message("It appears we are already running, exiting.")
                 sys.exit(1)

-                    
+

     # write out our process id
     pidfile = file(NODEUPDATE_PID_FILE, 'w')
     pidfile.write("{}\n".format(os.getpid()))
     pidfile.close()
 
     # write out our process id
     pidfile = file(NODEUPDATE_PID_FILE, 'w')
     pidfile.write("{}\n".format(os.getpid()))
     pidfile.close()
 

-    

     nodeupdate = NodeUpdate(doReboot)
     if not nodeupdate:
         Error("Unable to initialize.")
     nodeupdate = NodeUpdate(doReboot)
     if not nodeupdate:
         Error("Unable to initialize.")