Commit 6866276c authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.57.10

parent 769b4273
...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR ...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.57.9" EPMVERSION="3.57.10"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -3936,6 +3936,7 @@ epm_install_names() ...@@ -3936,6 +3936,7 @@ epm_install_names()
case $PMTYPE in case $PMTYPE in
apt-rpm|apt-dpkg) apt-rpm|apt-dpkg)
APTOPTIONS="$APTOPTIONS $(subst_option verbose "-o Debug::pkgMarkInstall=1 -o Debug::pkgProblemResolver=1")" APTOPTIONS="$APTOPTIONS $(subst_option verbose "-o Debug::pkgMarkInstall=1 -o Debug::pkgProblemResolver=1")"
# https://bugzilla.altlinux.org/44670
VIRTAPTOPTIONS="-o APT::Install::VirtualVersion=true -o APT::Install::Virtual=true" VIRTAPTOPTIONS="-o APT::Install::VirtualVersion=true -o APT::Install::Virtual=true"
# not for kernel packages # not for kernel packages
echo "$*" | grep -q "^kernel-" && VIRTAPTOPTIONS='' echo "$*" | grep -q "^kernel-" && VIRTAPTOPTIONS=''
...@@ -15254,10 +15255,9 @@ get_host_only() ...@@ -15254,10 +15255,9 @@ get_host_only()
concatenate_url_and_filename() concatenate_url_and_filename()
{ {
local url="$1" local url="$(echo "$1" | sed -e 's|/*$||' )"
local fn="$2" local fn="$(echo "$2" | sed -e 's|^/*||' )"
# workaround for a slash in the end of URL echo "$url/$fn"
echo "$(echo "$url" | sed -e 's|/*$||' )/$fn"
} }
# MADEURL filled with latest made URL as flag it is end form of URL # MADEURL filled with latest made URL as flag it is end form of URL
......
...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR ...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.57.9" EPMVERSION="3.57.10"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
......
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