Commit c75f4910 authored by Vitaly Lipatov's avatar Vitaly Lipatov

small fixes

parent 2a3fb68f
...@@ -344,6 +344,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -344,6 +344,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
# if more then one spec, use common task # if more then one spec, use common task
if [ "$PREPARETASK" = "internal" ] || [ -n "$RUNTASK" ] ; then if [ "$PREPARETASK" = "internal" ] || [ -n "$RUNTASK" ] ; then
docmd ssh $GEARHOST task run $TESTONLY $TASKNUMBER docmd ssh $GEARHOST task run $TESTONLY $TASKNUMBER
res=$?
fi fi
if [ -n "$TASKNUMBER" ] ; then if [ -n "$TASKNUMBER" ] ; then
...@@ -351,7 +352,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then ...@@ -351,7 +352,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
GIT_ALT=$GEARHOST girar-show "$TASKNUMBER@" GIT_ALT=$GEARHOST girar-show "$TASKNUMBER@"
fi fi
exit exit $res
fi fi
pack_src_rpm $LISTRPMARGS pack_src_rpm $LISTRPMARGS
...@@ -374,9 +375,9 @@ fi ...@@ -374,9 +375,9 @@ fi
#pkg_release_check $LISTBUILT #pkg_release_check $LISTBUILT
# if only one file # if only one file
if [ -r "$LISTBUILT" ] ; then #if [ -r "$LISTBUILT" ] ; then
check_gear_and_tag # check_gear_and_tag
fi #fi
echog "Will try to sign follow packages with GPG: \$LISTBUILT" echog "Will try to sign follow packages with GPG: \$LISTBUILT"
......
...@@ -46,7 +46,7 @@ list_systems() ...@@ -46,7 +46,7 @@ list_systems()
html_filter() html_filter()
{ {
grep "src.rpm" | sed -e "s|.*href=\"||g" | sed -e "s|\".*||g" grep "src.rpm" | sed -e "s|.*href=\"||g" | sed -e "s|\".*||g" | grep "rpm$"
} }
list_filter() list_filter()
......
...@@ -175,6 +175,8 @@ function get_source_git() ...@@ -175,6 +175,8 @@ function get_source_git()
local HGIT="$(grep -B1 "^$SN:" "$1" | head -n1 | grep "^# " | sed -e "s|#[[:space:]]*||" -e "s|[[:space:]]*$||")" local HGIT="$(grep -B1 "^$SN:" "$1" | head -n1 | grep "^# " | sed -e "s|#[[:space:]]*||" -e "s|[[:space:]]*$||")"
if echo "$HGIT" | grep -q -E "(git|https|http)://.*\.git$" || echo "$HGIT" | grep -q "https://github.com/.*" ; then if echo "$HGIT" | grep -q -E "(git|https|http)://.*\.git$" || echo "$HGIT" | grep -q "https://github.com/.*" ; then
GETSOURCEGIT="$(echo "$HGIT" | sed -e "s|.*[[:space:]]\(.*://\)|\1|")" #" GETSOURCEGIT="$(echo "$HGIT" | sed -e "s|.*[[:space:]]\(.*://\)|\1|")" #"
else
return 1
fi fi
} }
......
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