]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Set locale before check dnsmasq version
authorXu Han Peng <xuhanp@cn.ibm.com>
Fri, 23 Jan 2015 07:21:33 +0000 (15:21 +0800)
committerXu Han Peng <xuhanp@cn.ibm.com>
Wed, 28 Jan 2015 09:48:36 +0000 (17:48 +0800)
In some locale settings, cmd "dnsmasq --version" returns unexpected
result even when dnsmasq is the right version.

This fix sets env variable as "LC_ALL=C" to make sure dnsmasq version
check returns correct result.

Change-Id: I3d1c7793632f2c62e7b54e250e052de15f978e59
Closes-Bug:1412738

neutron/cmd/sanity/checks.py

index 9c77aa0b022ca868bbda146657f7eb0bd33357b7..094305661f69ff78c4e6323854ba764ced416101 100644 (file)
@@ -144,7 +144,8 @@ def get_minimal_dnsmasq_version_supported():
 def dnsmasq_version_supported():
     try:
         cmd = ['dnsmasq', '--version']
-        out = agent_utils.execute(cmd)
+        env = {'LC_ALL': 'C'}
+        out = agent_utils.execute(cmd, addl_env=env)
         m = re.search(r"version (\d+\.\d+)", out)
         ver = float(m.group(1)) if m else 0
         if ver < MINIMUM_DNSMASQ_VERSION: