Merge branch 'master' into install

This commit is contained in:
Nico Schottelius 2011-09-23 14:21:01 +02:00
commit e95defa6d2
4 changed files with 30 additions and 6 deletions

View file

@ -485,7 +485,7 @@ class Cdist:
] ]
for bin in paths: for bin in paths:
if os.path.isfile(bin): if os.path.isfile(bin):
# omit "gen" from gencode and # omit "gen" from gencode and use it for output base
outfile=os.path.join(self.object_dir(cdist_object), outfile=os.path.join(self.object_dir(cdist_object),
os.path.basename(bin)[3:]) os.path.basename(bin)[3:])
@ -507,6 +507,10 @@ class Cdist:
# Add header and make executable - identically to 0o700 # Add header and make executable - identically to 0o700
os.chmod(outfile, stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR) os.chmod(outfile, stat.S_IXUSR | stat.S_IRUSR | stat.S_IWUSR)
# Mark object as changed
open(os.path.join(self.object_dir(cdist_object), "changed"), "w").close()
if mode == "code": if mode == "code":
local_dir = self.object_dir(cdist_object) local_dir = self.object_dir(cdist_object)
remote_dir = self.remote_object_dir(cdist_object) remote_dir = self.remote_object_dir(cdist_object)
@ -684,12 +688,12 @@ def emulator():
sys.exit(1) sys.exit(1)
else: else:
param_fd = open(file, "r") param_fd = open(file, "r")
param_old = param_fd.realines() param_old = param_fd.readlines()
param_fd.close() param_fd.close()
if(param_old != param): if(param_old != param):
print("Parameter differs: " + param_old + "vs," + param) print("Parameter " + param + " differs: " + " ".join(param_old) + " vs. " + param)
print("Source = " + old_object_source + "new =" + object_source) print("Sources: " + " ".join(old_object_source) + " and " + object_source)
sys.exit(1) sys.exit(1)
else: else:
param_fd = open(file, "w") param_fd = open(file, "w")

View file

@ -1,5 +1,7 @@
2.0.1: 2.0.1: 2011-09-23
* Bugfix cdist: Always print source of error in case of exec errors * Bugfix core: Always print source of error in case of exec errors
* Bugfix core: Various smaller bugs in string concatenation
* Feature: Add marker "changed" to changed objects
2.0.0: 2011-09-16 2.0.0: 2011-09-16
* New Type: __package_rubygem (Chase Allen James) * New Type: __package_rubygem (Chase Allen James)

View file

@ -13,6 +13,14 @@
- Fix / rewrite cdist-quickstart - Fix / rewrite cdist-quickstart
- write tutorial!!!!!!!!!
- like ccollect!
- include ssh control master!
- add local/ hint (and add to git)
- add hint for ssh StrictHostKeyChecking no
- and that ssh will wait for answer of prompt
- nasty if used in parallel mode (scroll up!)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- Initial install support - Initial install support

View file

@ -154,6 +154,16 @@ done
cat << eof cat << eof
OBJECTS
-------
For object to object communication and tests, the following paths are
usable within a object directory:
changed::
This empty file exists in an object directory, if the object has
code to be excuted (either remote or local)
ENVIRONMENT VARIABLES ENVIRONMENT VARIABLES
--------------------- ---------------------
__explorer:: __explorer::