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
class conf_files:
def __init__(self, noscripts=False):
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
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)
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.")