Skip to content

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

small fixes

parent 24f12733
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
bin/rpmbsh
View file @ b3a22207
...@@ -129,9 +129,9 @@ if [ ! "$RESULT" = "0" ] || [ -z "$RPMBSARGS" ]; then ...@@ -129,9 +129,9 @@ if [ ! "$RESULT" = "0" ] || [ -z "$RPMBSARGS" ]; then
fi fi
if rhas "$LISTNAMES" .spec ; then if rhas "$LISTNAMES" .spec ; then
is_gear $SPECDIR && TSKLIST=$LISTNAMES is_gear $LISTNAMES && TSKLIST="$LISTNAMES"
else else
TSKLIST=$LISTBUILT TSKLIST="$LISTBUILT"
fi fi
docmd $ETERBUILDBIN/rpmbs $GIRARHOST -b $BINARYREPO $RPMBSARGS $TSKLIST docmd $ETERBUILDBIN/rpmbs $GIRARHOST -b $BINARYREPO $RPMBSARGS $TSKLIST
......
bin/rpmgs
View file @ b3a22207
...@@ -103,7 +103,7 @@ function source_ext() ...@@ -103,7 +103,7 @@ function source_ext()
[ "$SN" = "0" ] && SN="$SN\?" [ "$SN" = "0" ] && SN="$SN\?"
if grep -q "# Source$SN-$2:" "$1" ; then if grep -q "# Source$SN-$2:" "$1" ; then
local TMPSPEC=$1.tmpurl local TMPSPEC=$1.tmpurl
local NEWSOURCE=$(grep "# Source$SN-$2:" "$1" | sed -e "s/.*$2:[ \t]*//g") local NEWSOURCE=$(grep "# Source$SN-$2:" "$1" | sed -e "s/.*$2:[ \t]*//g" | tail -n1)
test -n "$NEWSOURCE" || fatal "Can't extract URL from Source$SN-$2" test -n "$NEWSOURCE" || fatal "Can't extract URL from Source$SN-$2"
# Fake replace for correct subst variables # Fake replace for correct subst variables
NEWSOURCE="$(echo "$NEWSOURCE" | sed -e 's|\&|\\&|g')" NEWSOURCE="$(echo "$NEWSOURCE" | sed -e 's|\&|\\&|g')"
......
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