"""A few things that didn't seem to fit anywhere else."""
-import os
+import os, os.path
import pwd
import tempfile
import fcntl
os.setsid()
if os.fork() != 0: os._exit(0)
os.chdir('/')
- os.umask(0)
+ os.umask(0022)
devnull = os.open(os.devnull, os.O_RDWR)
os.dup2(devnull, 0)
# xxx fixme - this is just to make sure that nothing gets stupidly lost - should use devnull
return temporary_filename
# replace a target file with a new contents - checks for changes
-# return True if a change occurred, in which case
-# chown/chmod settings should be taken care of
+# can handle chmod if requested
+# can also remove resulting file if contents are void, if requested
+# performs atomically:
+# writes in a tmp file, which is then renamed (from sliverauth originally)
+# returns True if a change occurred, or the file is deleted
def replace_file_with_string (target, new_contents, chmod=None, remove_if_empty=False):
try:
current=file(target).read()
if current==new_contents:
# if turns out to be an empty string, and remove_if_empty is set,
# then make sure to trash the file if it exists
- if remove_if_empty and os.path.isfile(target):
+ if remove_if_empty and not new_contents and os.path.isfile(target):
+ logger.verbose("tools.replace_file_with_string: removing file %s"%target)
try: os.unlink(target)
finally: return True
return False
- # overwrite target file
- f=file(target,'w')
- f.write(new_contents)
- f.close()
+ # overwrite target file: create a temp in the same directory
+ path=os.path.dirname(target) or '.'
+ fd, name = tempfile.mkstemp('','repl',path)
+ os.write(fd,new_contents)
+ os.close(fd)
+ if os.path.exists(target):
+ os.unlink(target)
+ os.rename(name,target)
if chmod: os.chmod(target,chmod)
return True
-# not needed yet - should that unlink the new file ?
-#def replace_file_with_file (target, new):
-# return replace_file_with_string (target, file(new).read())
####################
# utilities functions to get (cached) information from the node