From 93b3014617a6b6c151cf8a5493714d8108165de9 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Oct 01 2014 16:40:46 +0000
Subject: Update to upstream 0.0.7


---

diff --git a/.gitignore b/.gitignore
index 8d8c102..e8c10df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /diskimage-builder-0.1.15.tar.gz
 /dib-utils-0.0.6.tar.gz
+/dib-utils-0.0.7.tar.gz
diff --git a/0001-Update-dib-run-parts.patch b/0001-Update-dib-run-parts.patch
deleted file mode 100644
index db90e47..0000000
--- a/0001-Update-dib-run-parts.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From e7f3edab66f55c8bc8cbb26e8dbbae0aa978f088 Mon Sep 17 00:00:00 2001
-From: James Slagle <jslagle@redhat.com>
-Date: Thu, 18 Sep 2014 09:40:34 -0400
-Subject: [PATCH] Update dib-run-parts
-
-dib-run-parts in dib-utils had several fixes missing that had been
-committed to diskimage-builder. When diskimage-builder switched to using
-dib-run-parts from dib-utils, we lost these fixes. The switch over
-happened in Ia0a0df7784a14c49b5c47ac0b03e6c2602c84b3b
-
-These are the fixes from diskimage-builder that this commit adds back:
-I44cf98dfc80cfcaec54b88cc83be80a3dbf2cec3
-I24fd76c2b4f66b8036010b5079db39ead729abee
-Iad2d490c86dceab148ea9ab08f457c49a5d5352e
-Ieb48faacb4c96b7b358771d70c17f2f22d0354f4
-Ia68853505485fefbf0890313456e7edb6097666b
-Ibfb562c5970b40598fc95da1e8d4beb9d51d7612
-
-Change-Id: Ice4b6a4b3d36a02099a682ae8cda4721211d51d9
----
- bin/dib-run-parts | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/bin/dib-run-parts b/bin/dib-run-parts
-index 9d5c1aa..72d8e7d 100755
---- a/bin/dib-run-parts
-+++ b/bin/dib-run-parts
-@@ -2,7 +2,6 @@
- # Inspired by Debian and RedHat run-parts but portable and specific to di-b.
- #
- # Copyright 2012 Hewlett-Packard Development Company, L.P.
--# All Rights Reserved.
- #
- # Licensed under the Apache License, Version 2.0 (the "License"); you may
- # not use this file except in compliance with the License. You may obtain
-@@ -20,6 +19,7 @@ allowed_regex=${RUN_PARTS_REGEX:-"^[0-9A-Za-z_-]+$"}
- show_list=
- 
- set -ue
-+set -o pipefail
- 
- name=$(basename $0)
- 
-@@ -62,10 +62,10 @@ fi
- targets=$(find $target_dir -maxdepth 1 -xtype f -executable -printf '%f\n' | grep -E "$allowed_regex" | LANG=C sort -n || echo "")
- 
- if [ "$show_list" == "1" ] ; then
--  for target in $targets ; do
--    echo "${target_dir}/${target}"
--  done
--  exit 0
-+    for target in $targets ; do
-+        echo "${target_dir}/${target}"
-+    done
-+    exit 0
- fi
- 
- PROFILE_DIR=$(mktemp -d --tmpdir profiledir.XXXXXX)
-@@ -74,7 +74,8 @@ ENVIRONMENT_D_DIR=$target_dir/../environment.d
- 
- if [ -d $ENVIRONMENT_D_DIR ] ; then
-     env_files=$(find $ENVIRONMENT_D_DIR -maxdepth 1 -xtype f | \
--        grep -E "/[0-9A-Za-z_\.-]+$")
-+        grep -E "/[0-9A-Za-z_\.-]+$" | \
-+        LANG=C sort -n)
-     for env_file in $env_files ; do
-         source $env_file
-     done
-@@ -103,7 +104,7 @@ for target in $(find . -name 'start_*' -printf '%f\n') ; do
-     start_seconds=$(cat $target)
-     stop_seconds=$(cat $stop_file)
-     duration=$(python -c "print($stop_seconds - $start_seconds)")
--    LC_ALL=C printf "%-40s %10.3f\n" ${target##start_} $duration
-+    LC_NUMERIC=C LC_ALL=C printf "%-40s %10.3f\n" ${target##start_} $duration
- done
- popd > /dev/null
- rm -rf $PROFILE_DIR
diff --git a/dib-utils.spec b/dib-utils.spec
index ff2be19..f493f67 100644
--- a/dib-utils.spec
+++ b/dib-utils.spec
@@ -1,7 +1,7 @@
 Name:       dib-utils
 Summary:    Pieces of diskimage-builder that are useful standalone
-Version:    0.0.6
-Release:    3%{?dist}
+Version:    0.0.7
+Release:    1%{?dist}
 License:    ASL 2.0
 Group:      System Environment/Base
 URL:        https://git.openstack.org/cgit/openstack/dib-utils
@@ -41,6 +41,9 @@ diskimage-builder and its dependencies.
 %{python_sitelib}/dib_utils*
 
 %changelog
+* Wed Oct 01 2014 James Slagle <jslagle@redhat.com> 0.0.7-1
+- Update to upstream 0.0.7
+
 * Thu Sep 18 2014 James Slagle <jslagle@redhat.com> - 0.0.6-3
 - Add patch to update dib-run-parts to fix sourcing of environment.d files
 
diff --git a/sources b/sources
index c77d1b3..2672d49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33f72d5d391c115cf5e7a98c8f6b0aae  dib-utils-0.0.6.tar.gz
+6a1e06db7183d9b18e02ecafc5d94180  dib-utils-0.0.7.tar.gz