Commit 4d2de7bc authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm print name using

parent f8617af5
...@@ -26,8 +26,7 @@ load_helper epm-assure ...@@ -26,8 +26,7 @@ load_helper epm-assure
__epm_check_if_needed_repack() __epm_check_if_needed_repack()
{ {
# FIXME: use real way (for any archive) # FIXME: use real way (for any archive)
# FIXME: from вроде не существует и не работает local pkgname="$(epm print name for package "$1")"
local pkgname="$(epm print name from "$1")"
local repackcode="$EPM_REPACK_SCRIPTS_DIR/$pkgname.sh" local repackcode="$EPM_REPACK_SCRIPTS_DIR/$pkgname.sh"
[ -s "$repackcode" ] || return [ -s "$repackcode" ] || return
warning "There is repack rule for $pkgname package. It is better install this package via 'epm --repack install' or 'epm play'." warning "There is repack rule for $pkgname package. It is better install this package via 'epm --repack install' or 'epm play'."
......
...@@ -69,7 +69,7 @@ __epm_repo_pkgdel_alt() ...@@ -69,7 +69,7 @@ __epm_repo_pkgdel_alt()
for arch in $archlist ; do for arch in $archlist ; do
local rd="$REPO_DIR/$arch/RPMS.$REPO_NAME" local rd="$REPO_DIR/$arch/RPMS.$REPO_NAME"
for i in $rd/$1* ; do for i in $rd/$1* ; do
[ "$1" = "$(epm print pkgname from $i)" || continue [ "$1" = "$(epm print name for package $i)" || continue
rm -v $rd/$1* rm -v $rd/$1*
done done
done done
...@@ -84,7 +84,7 @@ __epm_repo_pkgupdate_alt() ...@@ -84,7 +84,7 @@ __epm_repo_pkgupdate_alt()
local dir="$1" local dir="$1"
shift shift
for i in "$@" ; do for i in "$@" ; do
pkg="$(epm print pkgname from $i)" || fatal pkg="$(epm print name for package $i)" || fatal
__epm_repo_pkgdel_alt "$dir" $pkg __epm_repo_pkgdel_alt "$dir" $pkg
done done
__epm_repo_pkgadd_alt "$dir" "$@" __epm_repo_pkgadd_alt "$dir" "$@"
......
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