X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=tools.py;h=d8f216e838b2f82a96f24326f535832f9d87b9f8;hp=96df45151e6bbfd1b4b3f08da3cdc4a1b36b757a;hb=74d5761f260b5d887733e826b4ce6aed11f11487;hpb=6f1c653e7f3712cd67d5db796eeae5c35fdddf5f diff --git a/tools.py b/tools.py index 96df451..d8f216e 100644 --- a/tools.py +++ b/tools.py @@ -168,7 +168,8 @@ def write_temp_file(do_write, mode=None, uidgid=None): return temporary_filename -def replace_file_with_string(target, new_contents, chmod=None, remove_if_empty=False): +def replace_file_with_string(target, new_contents, + chmod=None, remove_if_empty=False): """ Replace a target file with a new contents checks for changes: does not do anything if previous state was already right @@ -179,8 +180,8 @@ writes in a tmp file, which is then renamed (from sliverauth originally) returns True if a change occurred, or the file is deleted """ try: - with open(target) as f: - current = f.read() + with open(target) as feed: + current = feed.read() except: current = "" if current == new_contents: