From 51f80fce6102cfd57c291b58b01c60319f569749 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 25 Jun 2008 08:55:42 +0000 Subject: [PATCH] passes slicefamily unconditionnaly, as for node_id --- conf_files.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf_files.py b/conf_files.py index 8b0119f..e6bfae2 100644 --- a/conf_files.py +++ b/conf_files.py @@ -57,9 +57,11 @@ class conf_files: url += "node_id=%d"%tools.node_id() else: logger.log('%s -- WARNING, cannot add node_id to request'%dest) - # replace @SLICEFAMILY@ with what's stored on the node + # pass slicefamily as well, as stored in /etc/planetlab/slicefamily ont the node if tools.slicefamily(): - url = url.replace("@SLICEFAMILY@",tools.slicefamily()) + if url.find('?') >0: url += '&' + else: url += '?' + url += "slicefamily=%s"%tools.slicefamily() try: logger.log("retrieving URL=%s"%url) contents = curlwrapper.retrieve(url, self.config.cacert) -- 2.45.2