From c709d50afed14308c3cef4a823f440ca7972ba6f Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 7 Mar 2016 14:00:58 +1100
Subject: [PATCH] Update bashate to 0.5.0

Update bashate to 0.5.0 release.  We got things ready for this with
I3fd5d55236e90c2f2c25243af87adaf0c1b763e2.

I'm not sure what I was thinking in
I9e4b1c0dc9e0f709d8e76f9c9bf1c9478b2605ed when I added ".orig" files
to the list of files to check.  Ignore diff/merge files.

Change-Id: I8bb0c8b39972abb775b4e5556e79d2e17005bc8c
---
 tox.ini | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index ef557fbffe..3dfc37711c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ install_command = pip install {opts} {packages}
 # against devstack, just set BASHATE_INSTALL_PATH=/path/... to your
 # modified bashate tree
 deps =
-   {env:BASHATE_INSTALL_PATH:bashate==0.4.0}
+   {env:BASHATE_INSTALL_PATH:bashate==0.5.0}
 whitelist_externals = bash
 commands = bash -c "find {toxinidir}             \
          -not \( -type d -name .?\* -prune \)    \
@@ -22,9 +22,10 @@ commands = bash -c "find {toxinidir}             \
          -not -name \*~                          \
          -not -name \*.md                        \
          -not -name stack-screenrc               \
+         -not -name \*.orig                      \
+         -not -name \*.rej                       \
          \(                                      \
           -name \*.sh -or                        \
-          -name \*.orig -or                      \
           -name \*rc -or                         \
           -name functions\* -or                  \
           -wholename \*/inc/\* -or               \