From 368c2a8d36daee366ed551e1af365ec99ea0c150 Mon Sep 17 00:00:00 2001 From: Sergey Reshetnyak Date: Mon, 9 Nov 2015 22:30:19 +0300 Subject: [PATCH] Fix E005 bashate error Change-Id: Ia7a85ae5308e3fc095e84daf729ea082eedb9c1a Partial-bug: #1509271 --- devstack/settings | 2 ++ devstack/upgrade/settings | 2 ++ tox.ini | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/devstack/settings b/devstack/settings index b0dc9619de..5ee2e91f12 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,3 +1,5 @@ +#!/bin/bash + # Settings needed for the Sahara plugin # ------------------------------------- diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 88270ee254..72f548897e 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,3 +1,5 @@ +#!/bin/bash + register_project_for_upgrade sahara register_db_to_save sahara devstack_localrc base disable_service n-net diff --git a/tox.ini b/tox.ini index ef911b7821..976cee5ab6 100644 --- a/tox.ini +++ b/tox.ini @@ -45,7 +45,7 @@ commands = bash -c "find sahara -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null" # Run bashate checks bash -c "find sahara -iname '*.sh' -print0 | xargs -0 bashate -v" - bash -c "find devstack -not -name README.rst -type f -print0 | xargs -0 bashate -v" + bash -c "find devstack -not -name README.rst -and -not -name \*.json -type f -print0 | xargs -0 bashate -v" [testenv:doc8] deps =