From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 28 Nov 2006 21:35:39 +0000 (+0000)
Subject: - ignore /etc/proper/propd.conf (we deal with this separately in proper.py)
X-Git-Tag: planetlab-4_0-rc1~26
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=092c03bb5bf7bbafb279d9a4685121ca54e80e5f

- ignore /etc/proper/propd.conf (we deal with this separately in proper.py)
---

diff --git a/conf_files.py b/conf_files.py
index ccdaa67..f002262 100644
--- a/conf_files.py
+++ b/conf_files.py
@@ -34,6 +34,8 @@ class conf_files:
     def update_conf_file(self, cf_rec):
         if not cf_rec['enabled']: return
         dest = cf_rec['dest']
+        # XXX Remove once old Node Manager is out of service
+        if dest == '/etc/proper/propd.conf': return
         err_cmd = cf_rec['error_cmd']
         mode = string.atoi(cf_rec['file_permissions'], base=8)
         uid = pwd.getpwnam(cf_rec['file_owner'])[2]