openstack/diskimage-builder
Code Issues Proposed changes

Merge "dib-lint: ignore blank lines in element ordering"

Browse Source
This commit is contained in:
Jenkins
2015-11-10 00:32:04 +00:00
committed by Gerrit Code Review
parent 484341c5ab 9189e24f6d
commit 3412ced2f0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/dib-lint
View File

@@ -96,10 +96,11 @@ for i in $(find elements -type f \
if [ $(basename $i) = "element-deps" ]; then if [ $(basename $i) = "element-deps" ]; then
UNSORTED=${TMPDIR}/element-deps.unsorted UNSORTED=${TMPDIR}/element-deps.unsorted
SORTED=${TMPDIR}/element-deps.sorted SORTED=${TMPDIR}/element-deps.sorted
grep -v '^#' $i > ${UNSORTED} grep -v -e '^#' -e '^$' $i > ${UNSORTED}
sort ${UNSORTED} > ${SORTED} sort ${UNSORTED} > ${SORTED}
if [ -n "$(diff -c ${UNSORTED} ${SORTED})" ]; then if [ -n "$(diff -c ${UNSORTED} ${SORTED})" ]; then
error "$i is not sorted alphabetically" error "$i is not sorted alphabetically"
diff -y ${UNSORTED} ${SORTED}
fi fi
fi fi