Skip to content

Commit

Permalink
Allow ELEMENTS_DIR to be configurable
Browse files Browse the repository at this point in the history
Prior to version 2.0.0 of diskimage-builder, the elements dir was hard
coded as 'elements' in dib-lint which allowed dib-lint to be consumed by
other projects (instack-undercloud). The 2.0.0 release has changed this
path and it is not overridable so that the other projects can still use
dib-lint. This change makes ELEMENTS_DIR and LIB_DIR check for an
existing environment variable so that dib-lint can be consumed outside
of the diskimage-builder project.

Change-Id: Iae1dade1e20a950e63ffe8dacfea0f23cf9923a0
Related-Bug: #1672730
  • Loading branch information
mwhahaha committed Mar 14, 2017
1 parent 756923c commit 02e5353
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bin/dib-lint
Expand Up @@ -21,8 +21,8 @@
set -eu
set -o pipefail

ELEMENTS_DIR=diskimage_builder/elements
LIB_DIR=diskimage_builder/lib
ELEMENTS_DIR=${ELEMENTS_DIR:-diskimage_builder/elements}
LIB_DIR=${LIB_DIR:-diskimage_builder/lib}

parse_exclusions() {
# Per-file exclusions
Expand Down

0 comments on commit 02e5353

Please sign in to comment.