Cleanup

slapprepare/slapprepare/slapupdate.py

@@ -39,7 +39,7 @@ import sys
 import tempfile
 
 
-# create console handler and set level to debug
+# create console handler and set level to warning
 ch = logging.StreamHandler()
 ch.setLevel(logging.WARNING)
 # create formatter
@@ -60,10 +60,10 @@ class Parser(OptionParser):
                       option_list=[
         Option("--slapos-configuration",
                default='/etc/opt/slapos/slapos.cfg',
-               help="Path to slapos configuration file"),        
+               help="Path to slapos configuration file"),
         Option("--srv-file",
                default='/srv/slapupdate',
-               help="Server status file."),        
+               help="Server status file."),
         Option("-v","--verbose",
                default=False,
                action="store_true",
@@ -190,7 +190,7 @@ def download_info_from_networkcache(path,slapos_conf):
       if entry['timestamp'] > timestamp:
         best_entry = entry
     return best_entry
-  
+
   return helper_download_network_cached_to_file(
     path=path,
     directory_key='slapos-upgrade',
@@ -243,7 +243,7 @@ def update_machine(config):
   # add ch to logger
   logger.addHandler(ch)
 
-  # Get configuration 
+  # Get configuration
   current_state = ConfigParser.RawConfigParser()
   current_state.read(config.srv_file)
   next_state = ConfigParser.RawConfigParser()
@@ -289,10 +289,6 @@ def update_machine(config):
       current_state.set('system','reboot',config.today.isoformat())
       save_current_state(current_state,config)
       os.system('reboot')
-      
-      
-
-
 
 
 # Class containing all parameters needed for configuration
@@ -347,8 +343,6 @@ class Config:
       self.logger.debug( "Last reboot : %s" % self.last_reboot)
       self.logger.debug( "Last upgrade : %s" % self.last_upgrade)
 
-      
-
 
 def main():
   """Update computer and slapos"""

upload-update.py

@@ -95,7 +95,7 @@ def upload_network_cached_from_file(path, networkcache_options):
     'timestamp':time.time(),
   }
   try:
-    helper_upload_network_cached_from_file(
+    if helper_upload_network_cached_from_file(
       path=path,
       directory_key='slapos-upgrade',
       metadata_dict=metadata_dict,
@@ -108,8 +108,8 @@ def upload_network_cached_from_file(path, networkcache_options):
       shacache_key_file=networkcache_options.get('shacache-key-file'),
       shadir_cert_file=networkcache_options.get('shadir-cert-file'),
       shadir_key_file=networkcache_options.get('shadir-key-file'),
-    )
-    print 'Uploaded git repository to cache.'
+    ):
+      print 'Uploaded update file to cache.'
   except Exception:
     print 'Unable to upload to cache:\n%s.' % traceback.format_exc()