Skip to content

E
etersoft-build-utils
Commit 1ba38790 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmgs: fix return state

parent 1c392772
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
bin/rpmgs
View file @ 1ba38790
...@@ -264,13 +264,15 @@ gear_update_from_tarball() ...@@ -264,13 +264,15 @@ gear_update_from_tarball()
shift 2 shift 2
[ -d "$CURNAME" ] || CREATEFLAG=-c [ -d "$CURNAME" ] || CREATEFLAG=-c
# TODO: check tarball ext. for unsupported arch and realize it here or in gear-update # TODO: check tarball ext. for unsupported arch and realize it here or in gear-update
echo "Commit tarball '$TARBALL' to git subdir '$CURNAME' with $CREATEFLAG..." echo "Commit tarball '$TARBALL' to git subdir '$CURNAME'..."
if ! gear-update $CREATEFLAG $@ "$TARBALL" "$CURNAME" ; then if ! gear-update $CREATEFLAG $@ "$TARBALL" "$CURNAME" ; then
if gear-update $CREATEFLAG $@ "$TARBALL" "$CURNAME" 2>&1 | grep -q "More than one subdirectory specified" ; then if gear-update $CREATEFLAG $@ "$TARBALL" "$CURNAME" 2>&1 | grep -q "More than one subdirectory specified" ; then
echo "Try unpack as is" echo "Try unpack as is"
CREATEFLAG="$CREATEFLAG -a" CREATEFLAG="$CREATEFLAG -a"
gear-update $CREATEFLAG $@ "$TARBALL" "$CURNAME" && return gear-update $CREATEFLAG $@ "$TARBALL" "$CURNAME" && return
fi fi
else
return 0
fi fi
fatal "can't import tarball '$TARBALL'" fatal "can't import tarball '$TARBALL'"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment