From 58de9e6415f5bdabde708c8584b21b59b7e96a88 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 2 Apr 2014 13:22:45 +1300
Subject: [PATCH] Disable check_uptodate.sh check in pep8

Running generate_sample.sh currently produces an invalid heat.conf.sample
due to bug #1288586.

This change disables the check_uptodate.sh in the tox pep8 so that the
gate-heat-pep8 job passes while we find a more appropriate solution.

Related-Bug: #1288586
(cherry picked from commit 79d8191c75e3dc5578686fdb68158cae36760641)

Conflicts:
	tox.ini

Change-Id: Ib20c4f892df68f7112d969d801a18a1a5bfbd474
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index e3710d5ae8..4573eb7bfd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,8 @@ commands =
 [testenv:pep8]
 commands =
     flake8 heat bin/heat-api bin/heat-api-cfn bin/heat-api-cloudwatch bin/heat-engine bin/heat-manage
-    {toxinidir}/tools/conf/check_uptodate.sh
+    # disable check_uptodate until a resolution is found to bug #1288586
+    #{toxinidir}/tools/conf/check_uptodate.sh
 
 [testenv:venv]
 commands = {posargs}