Skip to content

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

functions/rpm: improve error messages in build_rpms_name

parent b4db9cba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
share/eterbuild/functions/rpm
View file @ 6adc9c24
...@@ -10,7 +10,7 @@ load_mod build ...@@ -10,7 +10,7 @@ load_mod build
build_buildroot() build_buildroot()
{ {
local TWOPARAM="--quiet" local TWOPARAM="--quiet"
test -z "$BASENAME" && fatal "Use build_buildroot with BASENAME defined" test -z "$BASENAME" && fatal "Use build_buildroot() with BASENAME defined"
[ -n "$RPMTOPDIR" ] && TWOPARAM="--define=_topdir $RPMTOPDIR" [ -n "$RPMTOPDIR" ] && TWOPARAM="--define=_topdir $RPMTOPDIR"
BUILDROOT=`rpm "$TWOPARAM" --eval %buildroot | subst_namever` BUILDROOT=`rpm "$TWOPARAM" --eval %buildroot | subst_namever`
test -z "$BUILDROOT" && fatal "Fix rpm's buildroot" test -z "$BUILDROOT" && fatal "Fix rpm's buildroot"
...@@ -39,6 +39,7 @@ build_rpms_name() ...@@ -39,6 +39,7 @@ build_rpms_name()
# Optimization # Optimization
eval_spec $NAMESPEC $@ | grep ":" >$tmprpm eval_spec $NAMESPEC $@ | grep ":" >$tmprpm
BASENAME=$(cat $tmprpm | get_var "Name") BASENAME=$(cat $tmprpm | get_var "Name")
test -n "$BASENAME" || fatal "Can't get Name from spec (check spec syntax)"
RELEASE=$(cat $tmprpm | get_var "Release") RELEASE=$(cat $tmprpm | get_var "Release")
VERSION=$(cat $tmprpm | get_var "Version") VERSION=$(cat $tmprpm | get_var "Version")
TARBALLNAME=$(cat $tmprpm | get_var "Source.*") TARBALLNAME=$(cat $tmprpm | get_var "Source.*")
......
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