cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [3/6] git commit: updated refs/heads/feature/systemvm-persistent-config to 4a012dd
Date Wed, 11 Feb 2015 17:03:28 GMT
{ip: hosts} syntax goes wrong if ip contains 1::
Needs to anchore regexp


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ade49e0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ade49e0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ade49e0

Branch: refs/heads/feature/systemvm-persistent-config
Commit: 9ade49e0e44fe97da107cec65aa39250cb695c21
Parents: 3527946
Author: Ian Southam <isoutham@schubergphilis.com>
Authored: Mon Feb 9 15:40:36 2015 +0100
Committer: Ian Southam <isoutham@schubergphilis.com>
Committed: Mon Feb 9 15:40:36 2015 +0100

----------------------------------------------------------------------
 systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ade49e0/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
index 7278785..0a1c8e2 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py
@@ -130,7 +130,7 @@ class CsDhcp(CsDataBag):
     def write_hosts(self):
         file = CsFile("/etc/hosts")
         for ip in self.hosts:
-            file.search("%s" % ip, "%s\t%s" % (ip, self.hosts[ip]))
+            file.search("^%s" % ip, "%s\t%s" % (ip, self.hosts[ip]))
         file.commit()
         if file.is_changed():
             logging.info("Updated hosts file")
@@ -155,4 +155,4 @@ class CsDhcp(CsDataBag):
                 v['gateway'] = entry['default_gateway']
 
     def add_host(self, ip, hosts):
-        self.hosts.update({ip: hosts})
+        self.hosts[ip] = hosts


Mime
View raw message