Commit dd87316c authored by Vitaly Lipatov's avatar Vitaly Lipatov

remove UPLOADDIR var using and drop out copying after rpmbs by default

parent 39a15213
...@@ -131,6 +131,7 @@ extract_tarball_to_dest() ...@@ -131,6 +131,7 @@ extract_tarball_to_dest()
rpmbs_copying_built() rpmbs_copying_built()
{ {
[ -n "$ETERDESTSRPM" ] || return [ -n "$ETERDESTSRPM" ] || return
#[ -n "$ETERDESTSRPM" ] || fatal "Set ETERDESTSRPM to destination dir"
echog "Copying package(s) in \$ETERDESTSRPM" echog "Copying package(s) in \$ETERDESTSRPM"
if is_ssh_target "$ETERDESTSRPM" ; then if is_ssh_target "$ETERDESTSRPM" ; then
scp $LISTBUILT $ETERDESTSRPM || echog "Error during copying" scp $LISTBUILT $ETERDESTSRPM || echog "Error during copying"
...@@ -226,8 +227,6 @@ if [ -n "${DELETENOW}" ]; then ...@@ -226,8 +227,6 @@ if [ -n "${DELETENOW}" ]; then
exit 0 exit 0
fi fi
test -z "$ETERDESTSRPM" && ETERDESTSRPM=$UPLOADDIR${MENVARG/-/.}
# if just packing # if just packing
if [ -z "$SIGN" ]; then if [ -z "$SIGN" ]; then
rpmbs_copying_built rpmbs_copying_built
......
...@@ -41,10 +41,6 @@ ...@@ -41,10 +41,6 @@
# FIXME: для чего это? # FIXME: для чего это?
#REMOTERPMDIR="~/RPM" #REMOTERPMDIR="~/RPM"
# TODO: убрать поддержку по умолчанию (указывать явно ETERDESTSRPM?)
# Каталог, куда копируются подписанные src.rpm (командой rpmbs)
#UPLOADDIR=$RPMDIR/upload
# Адрес ftp-сервера компании # Адрес ftp-сервера компании
#COMPANYFTP=etersoft.ru #COMPANYFTP=etersoft.ru
......
...@@ -33,7 +33,6 @@ RPMDIR="$HOME/RPM" ...@@ -33,7 +33,6 @@ RPMDIR="$HOME/RPM"
OWNERMAIL=`rpm --eval %packager` OWNERMAIL=`rpm --eval %packager`
COMPANYFTP=etersoft.ru COMPANYFTP=etersoft.ru
UPLOADDIR="$RPMDIR/upload"
TARGETFTPBASE="/var/ftp" TARGETFTPBASE="/var/ftp"
LOGDIR="$RPMDIR/log" LOGDIR="$RPMDIR/log"
REMOTERPMDIR= REMOTERPMDIR=
......
...@@ -23,7 +23,7 @@ get_etersoft_srpm_path() ...@@ -23,7 +23,7 @@ get_etersoft_srpm_path()
# FIXME: pass foreign path, needs to handle proto:// separately from ftp.eter:/path # FIXME: pass foreign path, needs to handle proto:// separately from ftp.eter:/path
if ! echo $SOURCEFTP | grep -q $COMPANYFTP && ! echo $SOURCEFTP | grep -q ":" && ! echo $SOURCEFTP | grep -q "^/"; then if ! echo $SOURCEFTP | grep -q $COMPANYFTP && ! echo $SOURCEFTP | grep -q ":" && ! echo $SOURCEFTP | grep -q "^/"; then
# if source if not known target, or not ssh dest, or local local path, # if source if not known target, or not ssh dest, or local local path,
# just return empty and we will use UPLOADDIR var # just return empty
# TODO: we can use table for URL translating # TODO: we can use table for URL translating
return return
fi fi
......
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