[openstack-neutron/el6-icehouse] fix exception on systems with dnsmasq < 2.59

[Pádraig Brady]

commit 9380839a7028b581670a92291f7c00fab536eda7
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Feb 4 10:08:43 2014 +0000

    fix exception on systems with dnsmasq < 2.59
    
    Caused by incorrect indentation on the warning avoidance patch

 ...-use-parallel-installed-versions-in-RHEL6.patch |    4 ++--
 0002-Remove-dnsmasq-version-warning.patch          |   20 ++++++++++++--------
 openstack-neutron.spec                             |    5 ++++-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/0001-use-parallel-installed-versions-in-RHEL6.patch b/0001-use-parallel-installed-versions-in-RHEL6.patch
index 8217334..35b9218 100644
--- a/0001-use-parallel-installed-versions-in-RHEL6.patch
+++ b/0001-use-parallel-installed-versions-in-RHEL6.patch
@@ -7,8 +7,8 @@ of webob sqlalchemy python-routes paste-deploy python-jinja2-26
 
 Change-Id: I290f56eae61c87893639a9e5d29f7fff760452cf
 ---
- neutron/__init__.py | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
+ neutron/__init__.py |   31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
 
 diff --git a/neutron/__init__.py b/neutron/__init__.py
 index b2c81bd..fef4d32 100644
diff --git a/0002-Remove-dnsmasq-version-warning.patch b/0002-Remove-dnsmasq-version-warning.patch
index 43aef4b..406daca 100644
--- a/0002-Remove-dnsmasq-version-warning.patch
+++ b/0002-Remove-dnsmasq-version-warning.patch
@@ -1,25 +1,29 @@
-From d46ad1dc2096781c0db650a5a647f21b0c2f6316 Mon Sep 17 00:00:00 2001
+From 85a3b3a1ae3886db3b803db317974e33beaef6a2 Mon Sep 17 00:00:00 2001
 From: Terry Wilson <twilson at redhat.com>
 Date: Fri, 13 Dec 2013 09:41:43 -0600
 Subject: [PATCH] Remove dnsmasq version warning
 
 ---
- neutron/agent/linux/dhcp.py | 3 +++
- 1 file changed, 3 insertions(+)
+ neutron/agent/linux/dhcp.py |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
-index 137f7a9..204a4f5 100644
+index 137f7a9..7406597 100644
 --- a/neutron/agent/linux/dhcp.py
 +++ b/neutron/agent/linux/dhcp.py
 @@ -291,10 +291,13 @@ class Dnsmasq(DhcpLocalProcess):
              ver = re.findall("\d+.\d+", out)[0]
              is_valid_version = float(ver) >= cls.MINIMUM_VERSION
              if not is_valid_version:
+-                LOG.warning(_('FAILED VERSION REQUIREMENT FOR DNSMASQ. '
+-                              'DHCP AGENT MAY NOT RUN CORRECTLY! '
+-                              'Please ensure that its version is %s '
+-                              'or above!'), cls.MINIMUM_VERSION)
 +                if float(ver) < 2.48:
-                 LOG.warning(_('FAILED VERSION REQUIREMENT FOR DNSMASQ. '
-                               'DHCP AGENT MAY NOT RUN CORRECTLY! '
-                               'Please ensure that its version is %s '
-                               'or above!'), cls.MINIMUM_VERSION)
++                    LOG.warning(_('FAILED VERSION REQUIREMENT FOR DNSMASQ. '
++                                  'DHCP AGENT MAY NOT RUN CORRECTLY! '
++                                  'Please ensure that its version is %s '
++                                  'or above!'), cls.MINIMUM_VERSION)
 +                else:
 +                    LOG.info(_('dnsmasq version: %s'), ver)
          except (OSError, RuntimeError, IndexError, ValueError):
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index dc871db..e2e57df 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	0.3.b2%{?dist}
+Release:	0.4.b2%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -1021,6 +1021,9 @@ fi
 
 
 %changelog
+* Tue Feb 04 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.b2-4
+- Fix exception on systems with dnsmasq < 2.59
+
 * Mon Jan 27 2014 Terry Wilson <twilson at redhat.com> - 2014.1.b2-3
 - Update to icehouse milestone 2