Skip to content

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

fix some asserts

parent 475f6af6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
share/eterbuild/functions/common
View file @ ec137a91
...@@ -351,8 +351,8 @@ set_gear_host ...@@ -351,8 +351,8 @@ set_gear_host
# Used DISTRNAME # Used DISTRNAME
set_target_pkg_env() set_target_pkg_env()
{ {
assert_var DISTRNAME
[ "$($DISTRVENDOR -V)" -ge "20120519" ] || fatal "update rpm-build-altlinux-compat package to get new $DISTRVENDOR command" [ "$($DISTRVENDOR -V)" -ge "20120519" ] || fatal "update rpm-build-altlinux-compat package to get new $DISTRVENDOR command"
[ -n "$DISTRNAME" ] || fatal "Run set_target_pkg_env without DISTRNAME"
PKGFORMAT=$($DISTRVENDOR -p "$DISTRNAME") PKGFORMAT=$($DISTRVENDOR -p "$DISTRNAME")
PKGVENDOR=$($DISTRVENDOR -s "$DISTRNAME") PKGVENDOR=$($DISTRVENDOR -s "$DISTRNAME")
RPMVENDOR=$($DISTRVENDOR -n "$DISTRNAME") RPMVENDOR=$($DISTRVENDOR -n "$DISTRNAME")
......
share/eterbuild/functions/repl
View file @ ec137a91
...@@ -174,9 +174,10 @@ print_grpreq() ...@@ -174,9 +174,10 @@ print_grpreq()
# FIXME: need improvement # FIXME: need improvement
# use tests/test_repl_find.sh for test it # use tests/test_repl_find.sh for test it
# PKGVENDOR, PKGFORMAT, DISTRVERSION is already defined in detect_target_env() func
internal_repl_list() internal_repl_list()
{ {
# need be defined in detect_target_env()
assert_var PKGVENDOR PKGFORMAT DISTRVERSION
local REPLBASE="$1" local REPLBASE="$1"
local ARCHEXT="$2" local ARCHEXT="$2"
local FINDPKG=$REPLBASE.$PKGVENDOR.$DISTRVERSION$ARCHEXT local FINDPKG=$REPLBASE.$PKGVENDOR.$DISTRVERSION$ARCHEXT
......
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