Skip to content

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

rpmgs: small fixes

parent c3c41e41
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
bin/rpmgs
View file @ d1d346a9
...@@ -406,6 +406,7 @@ update_predownloaded() ...@@ -406,6 +406,7 @@ update_predownloaded()
# hack for subdir?? # hack for subdir??
#CURNAME=$BASENAME #CURNAME=$BASENAME
info "Preparing sources in $PSM for mode $MODE ..."
# TODO: add support for git # TODO: add support for git
rm -rf $PSM rm -rf $PSM
if [ -n "$GETSOURCEGIT" ] ; then if [ -n "$GETSOURCEGIT" ] ; then
...@@ -422,6 +423,7 @@ update_predownloaded() ...@@ -422,6 +423,7 @@ update_predownloaded()
[ -n "$VERBOSE" ] && RUNHOOK="sh -x" [ -n "$VERBOSE" ] && RUNHOOK="sh -x"
if [ -s $RGD/.gear/predownloaded-preinstall-hook ] ; then if [ -s $RGD/.gear/predownloaded-preinstall-hook ] ; then
echo
info "Detected .gear/predownloaded-preinstall-hook, running it ..." info "Detected .gear/predownloaded-preinstall-hook, running it ..."
$RUNHOOK $RGD/.gear/predownloaded-preinstall-hook $MODE $VERSION $RUNHOOK $RGD/.gear/predownloaded-preinstall-hook $MODE $VERSION
COMMITMSG="update predownloaded-$MODE with a hook script" COMMITMSG="update predownloaded-$MODE with a hook script"
...@@ -566,7 +568,7 @@ update_predownloaded() ...@@ -566,7 +568,7 @@ update_predownloaded()
cd - >/dev/null cd - >/dev/null
docmd git add -f $PSM docmd git add -f $PSM
docmd git commit $PSM -m "$COMMITMSG" docmd git commit -m "$COMMITMSG"
} }
...@@ -641,7 +643,7 @@ if is_gear $SPECDIR && [ -z "$GSSETVERSION" ] && $EPMCMD assure gear-rules-verif ...@@ -641,7 +643,7 @@ if is_gear $SPECDIR && [ -z "$GSSETVERSION" ] && $EPMCMD assure gear-rules-verif
update_predownloaded production update_predownloaded production
DOWNLOADSOME=1 DOWNLOADSOME=1
else else
warning "there are no .watch files in (get_root_git_dir)/.gear, skip rpm-uscan" warning "there are no .watch files in $(get_root_git_dir)/.gear, skip rpm-uscan"
fi fi
elif $GEAR_RULES_VERIFY | grep -Eq "Ready for external VCS update" ; then elif $GEAR_RULES_VERIFY | grep -Eq "Ready for external VCS update" ; then
#[ -n "$GSSETVERSION" ] && warning "we will ignore version and update to the latest version from watch file" #[ -n "$GSSETVERSION" ] && warning "we will ignore version and update to the latest version from watch file"
......
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