X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files.py;h=8bc3186b1dd4931d3246259341663bfc6bee23c9;hb=61c1ca0346aea5ed95330e4d4b2dedfb2ee5213a;hp=7fb28cb95a7d77e14ae540a8847bc1bbad5a1941;hpb=54c53b53e5deefc2525888212dbed5bb0f8b0a3b;p=nodemanager.git

diff --git a/conf_files.py b/conf_files.py
index 7fb28cb..8bc3186 100755
--- a/conf_files.py
+++ b/conf_files.py
@@ -5,15 +5,12 @@
 import grp
 import os
 import pwd
-try:
-    from hashlib import sha1 as sha
-except ImportError:
-    from sha import sha
+from hashlib import sha1 as sha
+import xmlrpc.client
 
 import curlwrapper
 import logger
 import tools
-import xmlrpc.client
 from config import Config
 
 # right after net
@@ -39,7 +36,8 @@ class conf_files:
         else: return 0
 
     def update_conf_file(self, cf_rec):
-        if not cf_rec['enabled']: return
+        if not cf_rec['enabled']:
+            return
         dest = cf_rec['dest']
         err_cmd = cf_rec['error_cmd']
         mode = int(cf_rec['file_permissions'], base=8)
@@ -56,8 +54,8 @@ class conf_files:
         url = 'https://%s/%s' % (self.config.PLC_BOOT_HOST, cf_rec['source'])
         # set node_id at the end of the request - hacky
         if tools.node_id():
-            if url.find('?') >0: url += '&'
-            else:                url += '?'
+            if url.find('?') > 0: url += '&'
+            else:                 url += '?'
             url += "node_id=%d"%tools.node_id()
         else:
             logger.log('conf_files: %s -- WARNING, cannot add node_id to request'%dest)