andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

in theory implement double definition strategy in new type emulator

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-19 00:52:09 +02:00
commit 9e99d420b6
1 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
bin/cdist
View file

@ -613,6 +613,7 @@ def emulator():
type_dir = os.path.join(os.environ['__cdist_type_base_dir'], type) type_dir = os.path.join(os.environ['__cdist_type_base_dir'], type)
param_dir = os.path.join(type_dir, "parameter") param_dir = os.path.join(type_dir, "parameter")
global_dir = os.environ['__global'] global_dir = os.environ['__global']
object_source = os.environ['__cdist_manifest']
parser = argparse.ArgumentParser(add_help=False) parser = argparse.ArgumentParser(add_help=False)
@ -652,6 +653,16 @@ def emulator():
object_id, DOT_CDIST) object_id, DOT_CDIST)
param_out_dir = os.path.join(object_dir, "parameter") param_out_dir = os.path.join(object_dir, "parameter")
object_source_file = os.path.join(object_dir, "source")
if os.path.exists(param_out_dir):
object_exists = True
old_object_source_fd = open(object_source_file, "r")
old_object_source = old_object_source_fd.readlines()
old_object_source_fd.close()
else:
object_exists = False
try: try:
os.makedirs(param_out_dir, exist_ok=True) os.makedirs(param_out_dir, exist_ok=True)
except OSError as error: except OSError as error:
@ -664,11 +675,27 @@ def emulator():
if value: if value:
file = os.path.join(param_out_dir, param) file = os.path.join(param_out_dir, param)
log.debug(file + "<-" + param + " = " + value) log.debug(file + "<-" + param + " = " + value)
# Already exists, verify all parameter are the same
if object_exists:
if not os.path.isfile(file):
print("New parameter + " + param + "specified, aborting")
print("Source = " + old_object_source + "new =" + object_source)
sys.exit(1)
else:
param_fd = open(file, "r")
param_old = param_fd.realines()
param_fd.close()
if(param_old != param):
print("Parameter differs: " + param_old + "vs," + param)
print("Source = " + old_object_source + "new =" + object_source)
sys.exit(1)
else:
param_fd = open(file, "w") param_fd = open(file, "w")
param_fd.writelines(value) param_fd.writelines(value)
param_fd.close() param_fd.close()
# Record requirements # Record requirements
if "__require" in os.environ: if "__require" in os.environ:
requirements = os.environ['__require'] requirements = os.environ['__require']
@ -677,12 +704,9 @@ def emulator():
require_fd.writelines(requirements.split(" ")) require_fd.writelines(requirements.split(" "))
require_fd.close() require_fd.close()
# FIXME: Merge / mv object into tree
# Record / Append source # Record / Append source
source = os.environ['__cdist_manifest']
source_fd = open(os.path.join(object_dir, "source"), "a") source_fd = open(os.path.join(object_dir, "source"), "a")
source_fd.writelines(source) source_fd.writelines(object_source)
source_fd.close() source_fd.close()
# sys.exit(1) # sys.exit(1)