fixed broken slice-creation

[nodemanager.git] / conf_files.py

diff --git a/conf_files.py b/conf_files.py
index 8c47f95..bccf20a 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -57,11 +57,6 @@ class conf_files:
             url += "node_id=%d"%tools.node_id()
         else:
             logger.log('%s -- WARNING, cannot add node_id to request'%dest)
-        # pass slicefamily as well, as stored in /etc/planetlab/slicefamily on the node
-        if tools.slicefamily():
-            if url.find('?') >0: url += '&'
-            else:                url += '?'
-            url += "slicefamily=%s"%tools.slicefamily()
         try:
             logger.verbose("retrieving URL=%s"%url)
             contents = curlwrapper.retrieve(url, self.config.cacert)
@@ -83,8 +78,8 @@ class conf_files:
         if data.has_key("conf_files"):
             for f in data['conf_files']:
                 try: self.update_conf_file(f)
-                except: logger.log_exc()
-        else: logger.log("conf_files:  No conf_files found or API failure.  Skipping")
+                except: logger.log_exc("failed to update conf_file")
+        else: logger.log("conf_files: No conf_files found or API failure.  Skipping")
 
 
 def start(options, config): pass