Commit 54034920 authored by Vitaly Lipatov's avatar Vitaly Lipatov

hack: don't pass EPMCURDIR to child processes

parent 1e00616d
......@@ -733,7 +733,7 @@ epm_install()
epm_install_names $names || return
# save files before install and repack
if [ -n "$download_only" ] ; then
if [ -n "$download_only" ] && [ -n "$files" ] ; then
echo
cp -v $files "$EPMCURDIR"
return
......
......@@ -42,7 +42,7 @@ __epm_pack()
local bashopt=''
[ -n "$verbose" ] && bashopt='-x'
#info "Running $($script --description 2>/dev/null) ..."
docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" || fatal
( unset EPMCURDIR ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" ) || fatal
returntarname="$(cat "$filefortarname")" || fatal "pack script $repackcode didn't set tarname"
if [ -n "$download_only" ] ; then
......
......@@ -56,7 +56,7 @@ __run_script()
local script="$psdir/$1.sh"
[ -x "$script" ] || return
shift
$script "$@"
( unset EPMCURDIR ; $script "$@" )
return
}
......
......@@ -171,7 +171,7 @@ __apply_fix_code()
export PATH=$PROGDIR:$PATH
local bashopt=''
[ -n "$verbose" ] && bashopt='-x'
docmd bash $bashopt $repackcode "$1" "$2" "$3" || fatal "There is an error from $repackcode script"
( unset EPMCURDIR ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" ) || fatal "There is an error from $repackcode script"
}
__create_rpmmacros()
......
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