Commit 64087b6c authored by Vitaly Lipatov's avatar Vitaly Lipatov

improve messages

parent 7b111989
...@@ -26,7 +26,7 @@ epm_Install() ...@@ -26,7 +26,7 @@ epm_Install()
local names="$(echo $pkg_names | filter_out_installed_packages)" local names="$(echo $pkg_names | filter_out_installed_packages)"
local files="$(echo $pkg_files | filter_out_installed_packages)" local files="$(echo $pkg_files | filter_out_installed_packages)"
[ -z "$files$names" ] && info "Install: Skip empty install list." && return 22 [ -z "$files$names" ] && info "Install: Empty install list was skipped." && return 22
epm_update || { [ -n "$force" ] || return ; } epm_update || { [ -n "$force" ] || return ; }
......
...@@ -72,7 +72,10 @@ __check_if_wildcard_downloading() ...@@ -72,7 +72,10 @@ __check_if_wildcard_downloading()
is_wildcard "$mask" || return 1 is_wildcard "$mask" || return 1
local fn local fn
fn="$(docmd eget --list "$url" | xargs -n1 basename)" fn="$(docmd eget --list "$url" | xargs -n1 basename 2>/dev/null)"
# just return if there is no answer
[ -n "$fn" ] || return 0
local wf="$(epm print shortname from filename $fn | wc -l)" local wf="$(epm print shortname from filename $fn | wc -l)"
local ws="$(epm print shortname from filename $fn | sort -u | wc -l)" local ws="$(epm print shortname from filename $fn | sort -u | wc -l)"
# not the same package of various versions # not the same package of various versions
......
...@@ -477,7 +477,7 @@ epm_install() ...@@ -477,7 +477,7 @@ epm_install()
__handle_pkg_urls_to_install __handle_pkg_urls_to_install
fi fi
[ -z "$pkg_files$pkg_names" ] && info "Skip empty install list" && return 22 [ -z "$pkg_files$pkg_names" ] && info "Empty install list was skipped" && return 22
# to be filter happy # to be filter happy
warmup_lowbase warmup_lowbase
...@@ -490,7 +490,7 @@ epm_install() ...@@ -490,7 +490,7 @@ epm_install()
# can be empty only after all installed packages were skipped # can be empty only after all installed packages were skipped
if [ -z "$files$names" ] ; then if [ -z "$files$names" ] ; then
# TODO: assert $skip_installed # TODO: assert $skip_installed
[ -n "$verbose" ] && info "Skip empty install list (filtered out, all requested packages is already installed)" [ -n "$verbose" ] && info "Empty install list was skipped (filtered out, all requested packages is already installed)"
# FIXME: see to_remove below # FIXME: see to_remove below
return 0 return 0
fi fi
...@@ -511,7 +511,7 @@ epm_install() ...@@ -511,7 +511,7 @@ epm_install()
;; ;;
esac esac
[ -z "$files" ] && debug "Skip empty install files list" && return 0 [ -z "$files" ] && debug "Empty install files list was skipped" && return 0
if [ -n "$download_only" ] ; then if [ -n "$download_only" ] ; then
# save files to the current dir before install and repack # save files to the current dir before install and repack
......
...@@ -225,7 +225,7 @@ epm_repack() ...@@ -225,7 +225,7 @@ epm_repack()
fi fi
[ -n "$pkg_names" ] && warning 'Can'\''t find $pkg_names files' [ -n "$pkg_names" ] && warning 'Can'\''t find $pkg_names files'
[ -z "$pkg_files" ] && info "Skip empty repack list" && return 22 [ -z "$pkg_files" ] && info "Empty repack list was skipped" && return 22
if __epm_repack $pkg_files && [ -n "$repacked_pkgs" ] ; then if __epm_repack $pkg_files && [ -n "$repacked_pkgs" ] ; then
if [ -n "$install" ] ; then if [ -n "$install" ] ; then
......
...@@ -148,7 +148,7 @@ EOF ...@@ -148,7 +148,7 @@ EOF
epm_simulate() epm_simulate()
{ {
[ -z "$pkg_filenames" ] && info "Simulate: Skip empty list" && return 22 [ -z "$pkg_filenames" ] && info "Simulate: skipped due empty list" && return 22
local filenames="$(echo $pkg_filenames | filter_out_installed_packages)" local filenames="$(echo $pkg_filenames | filter_out_installed_packages)"
......
...@@ -1164,20 +1164,20 @@ msgid "Have no suitable appropriate install command for $PMTYPE" ...@@ -1164,20 +1164,20 @@ msgid "Have no suitable appropriate install command for $PMTYPE"
msgstr "Нет подходящей команды для установки для $PMTYPE" msgstr "Нет подходящей команды для установки для $PMTYPE"
#: ../bin/epm-install:477 #: ../bin/epm-install:477
msgid "Skip empty install list" msgid "Empty install list was skipped"
msgstr "Пропустить пустой список для установки" msgstr "Пропускаем пустой список для установки"
#: ../bin/epm-install:490 #: ../bin/epm-install:490
msgid "" msgid ""
"Skip empty install list (filtered out, all requested packages is already " "Empty install list was skipped (filtered out, all requested packages is already "
"installed)" "installed)"
msgstr "" msgstr ""
"Пропустить пустой список для установки (отфильтровано, все запрошенные " "Пропускаем пустой список для установки (отфильтровано, все запрошенные "
"пакеты уже установлены)" "пакеты уже установлены)"
#: ../bin/epm-install:511 #: ../bin/epm-install:511
msgid "Skip empty install files list" msgid "Empty install files list was skipped"
msgstr "Пропустить пустой список файлов для установки" msgstr "Пропускаем пустой список файлов для установки"
#: ../bin/epm-reinstall:37 #: ../bin/epm-reinstall:37
msgid "Please send me the correct command form for it" msgid "Please send me the correct command form for it"
...@@ -1681,8 +1681,8 @@ msgid "Can't find $pkg_names files" ...@@ -1681,8 +1681,8 @@ msgid "Can't find $pkg_names files"
msgstr "Не удается найти файлы $pkg_names" msgstr "Не удается найти файлы $pkg_names"
#: ../bin/epm-repack:228 #: ../bin/epm-repack:228
msgid "Skip empty repack list" msgid "Empty repack list was skipped"
msgstr "Пропустить пустой список переупаковок" msgstr "Пропущен пустой список переупаковки"
#: ../bin/epm-repack:239 #: ../bin/epm-repack:239
msgid "Adapted packages:" msgid "Adapted packages:"
...@@ -2245,8 +2245,8 @@ msgstr "" ...@@ -2245,8 +2245,8 @@ msgstr ""
"пакетов." "пакетов."
#: ../bin/epm-Install:29 #: ../bin/epm-Install:29
msgid "Install: Skip empty install list." msgid "Install: Empty install list was skipped"
msgstr "Установка: пропустить пустой список установки." msgstr "Установка: пропущен пустой список установки."
#: ../bin/epm-query_package:30 #: ../bin/epm-query_package:30
msgid "" msgid ""
......
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