Commit 9dda124b authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm assure: move warning text from assure_exists()

parent 3f3429a8
...@@ -103,6 +103,10 @@ epm_assure() ...@@ -103,6 +103,10 @@ epm_assure()
[ -n "$PACKAGEVERSION" ] || return 0 [ -n "$PACKAGEVERSION" ] || return 0
# check if we couldn't update and still need update # check if we couldn't update and still need update
__epm_need_update $PACKAGE $PACKAGEVERSION && return 1 __epm_need_update $PACKAGE $PACKAGEVERSION || return 0
return 0
local textpackage
[ -n "$PACKAGEVERSION" ] && textpackage=" >= $PACKAGEVERSION"
warning "Can't assure in '$CMD' command from $PACKAGE$textpackage package"
return 1
} }
...@@ -563,10 +563,8 @@ assure_exists() ...@@ -563,10 +563,8 @@ assure_exists()
{ {
load_helper epm-assure load_helper epm-assure
local package="$2" local package="$2"
local textpackage=
[ -n "$package" ] || package="$(__get_package_for_command "$1")" [ -n "$package" ] || package="$(__get_package_for_command "$1")"
[ -n "$3" ] && textpackage=" >= $3" ( direct='' interactive=$ask epm_assure "$1" $package $3 ) || fatal
( direct='' epm_assure "$1" $package $3 ) || fatal "Can't assure in '$1' command from $package$textpackage package"
} }
assure_exists_erc() assure_exists_erc()
......
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