diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-17 15:30:12 +0000 |
---|---|---|
committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-17 22:18:54 +0000 |
commit | 1f6e52fb909f477b487e287b0ff66564d6ede308 (patch) | |
tree | 64643770d82483658007f35000998ef287237344 | |
parent | 7972c0fb5cf4fa0c77d3d8fd2e3a1f9ac3bdd39e (diff) |
Fix jbuild_patches_collect to ignore not yet checked out modules
-rwxr-xr-x | jhbuild_patches_collect | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jhbuild_patches_collect b/jhbuild_patches_collect index f24a6c4..a473482 100755 --- a/jhbuild_patches_collect +++ b/jhbuild_patches_collect @@ -10,10 +10,11 @@ LIST=`jhbuild -f jhbuildrc list` for i in $LIST ; do D=`jhbuild -f jhbuildrc run --in-checkoutdir="$i" -- bash -c 'pwd' 2>/dev/null` - D=`echo $D | tr '\n' ' ' ` - D=${D%% *} -# echo "$i: $D" - if [ "$D" != "$M" ] ; then + if [ $? == 0 ] ; then + D=`echo $D | tr '\n' ' ' ` + D=${D%% *} +# echo "$i: $D" + if [ "$D" != "$M" ] ; then cd $D if [ -e ".git" ]; then git diff --quiet --ignore-submodules || (echo "$i: dirty" && exit 1 ) || exit 1 @@ -24,5 +25,6 @@ for i in $LIST ; do mv $p $O/$i-`basename $p` done fi + fi fi done |