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

epm install: move task install code to epm_install_alt_tasks() function

parent bd4c202e
...@@ -423,35 +423,13 @@ epm_install_files() ...@@ -423,35 +423,13 @@ epm_install_files()
} }
# apt-repo with non_interactive support
apt_repo_prepare()
{
assure_exists apt-repo
[ -n "$non_interactive" ] || return
set_sudo
trap "$SUDO rm /etc/apt/apt.conf.d/eepm-apt-noninteractive.conf 2>/dev/null" EXIT
echo 'APT::Get::Assume-Yes "true";' | $SUDO tee /etc/apt/apt.conf.d/eepm-apt-noninteractive.conf >/dev/null
}
apt_repo_after()
{
[ -n "$non_interactive" ] || return
$SUDO rm /etc/apt/apt.conf.d/eepm-apt-noninteractive.conf 2>/dev/null
}
epm_install() epm_install()
{ {
if [ "$BASEDISTRNAME" = "alt" ] ; then if [ "$BASEDISTRNAME" = "alt" ] ; then
if tasknumber "$pkg_names" >/dev/null ; then if tasknumber "$pkg_names" >/dev/null ; then
local res load_helper epm-install-alt
# TODO: don't use apt-repo epm_install_alt_tasks "$pkg_names"
apt_repo_prepare return
sudocmd_foreach "apt-repo test" $(tasknumber $pkg_names)
res=$?
apt_repo_after
return $res
fi fi
fi fi
......
...@@ -181,3 +181,36 @@ epm_install_alt_names() ...@@ -181,3 +181,36 @@ epm_install_alt_names()
epm_install_names $installnames || return epm_install_names $installnames || return
epm_install_alt_kernel_module $kmlist || return epm_install_alt_kernel_module $kmlist || return
} }
# apt-repo with non_interactive support
apt_repo_prepare()
{
assure_exists apt-repo
[ -n "$non_interactive" ] || return
set_sudo
trap "$SUDO rm /etc/apt/apt.conf.d/eepm-apt-noninteractive.conf 2>/dev/null" EXIT
echo 'APT::Get::Assume-Yes "true";' | $SUDO tee /etc/apt/apt.conf.d/eepm-apt-noninteractive.conf >/dev/null
}
apt_repo_after()
{
[ -n "$non_interactive" ] || return
$SUDO rm /etc/apt/apt.conf.d/eepm-apt-noninteractive.conf 2>/dev/null
}
epm_install_alt_tasks()
{
local res
# TODO: don't use apt-repo
apt_repo_prepare
sudocmd_foreach "apt-repo test" $(tasknumber "$@")
res=$?
apt_repo_after
return $res
}
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