Commit e01e7a82 authored by Vitaly Lipatov's avatar Vitaly Lipatov

small fixes

parent fe61751b
......@@ -586,7 +586,7 @@ epm_install()
# repack binary files
if [ -n "$repack" ] ; then
# FIXME: see to_remove below
__epm_repack_rpm $files || fatal
__epm_repack_to_rpm $files || fatal
files="$repacked_rpms"
fi
......
......@@ -162,10 +162,11 @@ EOF
}
# will fill repacked_rpms var
__epm_repack_rpm()
__epm_repack_to_rpm()
{
assure_distr ALTLinux "install --repack"
# install epm-repack for static (package based) dependencies
assure_exists fakeroot || fatal
assure_exists alien || fatal
assure_exists rpmbuild rpm-build || fatal
......@@ -244,7 +245,7 @@ __epm_repack_rpm()
__epm_check_if_try_install_deb()
{
__epm_split_by_pkg_type deb "$@" || return 1
__epm_repack_rpm $split_replaced_pkgs || fatal
__epm_repack_to_rpm $split_replaced_pkgs || fatal
# TODO: move to install
docmd epm install $force $nodeps $repacked_rpms
......@@ -272,10 +273,9 @@ epm_repack()
[ -n "$pkg_names" ] && warning "Can't find $pkg_names"
[ -z "$pkg_files" ] && info "Skip empty repack list" && return 22
# TODO: если у нас rpm, а пакет - deb и наоборот
case $PKGFORMAT in
rpm)
__epm_repack_rpm $pkg_files || fatal
__epm_repack_to_rpm $pkg_files || fatal
echo
echo "Adapted packages:"
cp $repacked_rpms .
......
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