X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files.py;h=252c795c68882fcbb011ef86debe28b9be4d9789;hb=414182fc306d2ca10aff0c1a6074d47b12747069;hp=e7b823dd4b55c93696b03bdd1abfbdafc775890c;hpb=8a73c41fa38f330fd125d85d693d1390ea2477a4;p=nodemanager.git

diff --git a/conf_files.py b/conf_files.py
index e7b823d..252c795 100644
--- a/conf_files.py
+++ b/conf_files.py
@@ -1,19 +1,19 @@
-# $Id$
-# $URL$
-
 """configuration files"""
 
 import grp
 import os
 import pwd
-import sha
+try:
+    from hashlib import sha1 as sha
+except ImportError:
+    from sha import sha
 import string
 
 import curlwrapper
 import logger
 import tools
 import xmlrpclib
-from config import Config 
+from config import Config
 
 # right after net
 priority = 2
@@ -27,7 +27,7 @@ class conf_files:
     def checksum(self, path):
         try:
             f = open(path)
-            try: return sha.new(f.read()).digest()
+            try: return sha(f.read()).digest()
             finally: f.close()
         except IOError: return None
 
@@ -66,7 +66,7 @@ class conf_files:
         except xmlrpclib.ProtocolError,e:
             logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url))
             return
-        if not cf_rec['always_update'] and sha.new(contents).digest() == self.checksum(dest):
+        if not cf_rec['always_update'] and sha(contents).digest() == self.checksum(dest):
             return
         if self.system(cf_rec['preinstall_cmd']):
             self.system(err_cmd)
@@ -82,11 +82,11 @@ class conf_files:
             for f in data['conf_files']:
                 try: self.update_conf_file(f)
                 except: logger.log_exc("conf_files: failed to update conf_file")
-        else: 
+        else:
             logger.log_missing_data("conf_files.run_once",'conf_files')
 
 
-def start(options, config): pass
+def start(): pass
 
 def GetSlivers(data, config = None, plc = None):
     logger.log("conf_files: Running.")