From 1428079a845063b0ea8804c9d5d7e3752ad34f5a Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Mon, 27 Aug 2007 19:23:50 -0700
Subject: [PATCH] node: change get_or_create_config to strip whitespace and
accept a filemode= argument
---
src/allmydata/node.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index 40f48da2..aec6a70f 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -78,7 +78,7 @@ class Node(service.MultiService):
return None
raise
- def get_or_create_config(self, name, default_fn, mode="w"):
+ def get_or_create_config(self, name, default_fn, mode="w", filemode=None):
"""Try to get the (string) contents of a config file, and return it.
Any leading or trailing whitespace will be stripped from the data.
@@ -95,10 +95,15 @@ class Node(service.MultiService):
value = default_fn()
fn = os.path.join(self.basedir, name)
try:
- open(fn, mode).write(value)
+ f = open(fn, mode)
+ f.write(value)
+ f.close()
+ if filemode is not None:
+ os.chmod(fn, filemode)
except EnvironmentError, e:
self.log("Unable to write config file '%s'" % fn)
self.log(e)
+ value = value.strip()
return value
def write_config(self, name, value, mode="w"):
--
2.45.2