Commit 77e8576f authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmbs/rpmbsh: move src.rpm to ETERDESTSRPM instead copying

parent 88920d6b
...@@ -53,7 +53,7 @@ phelp() ...@@ -53,7 +53,7 @@ phelp()
echog " -b REPONAME - binary repository name (4.1, 5.0, 5.1 and so on)" echog " -b REPONAME - binary repository name (4.1, 5.0, 5.1 and so on)"
echog " -c - only sign package(s) with checking" echog " -c - only sign package(s) with checking"
echog " -f - force operation (overwrite tag)" echog " -f - force operation (overwrite tag)"
echog " -s - sign package(s) and copy it to upload dir (ETERDESTSRPM)" echog " -s - sign package(s) (and move it to dir ETERDESTSRPM if defined)"
echog " -t - set tag with sign" echog " -t - set tag with sign"
echog " -n - do not check with sisyphus_check before upload" echog " -n - do not check with sisyphus_check before upload"
echog " -o - create nosrc.rpm package" echog " -o - create nosrc.rpm package"
...@@ -149,13 +149,13 @@ extract_tarball_to_dest() ...@@ -149,13 +149,13 @@ extract_tarball_to_dest()
rpmbs_copying_built() rpmbs_copying_built()
{ {
[ -n "$ETERDESTSRPM" ] || return 0 [ -n "$ETERDESTSRPM" ] || return 0
echog "Copying package(s) in \$ETERDESTSRPM" echog "Moving 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 && rm -fv $LISTBUILT || echog "Error during copying"
else else
mkdir -p $ETERDESTSRPM || echog "Error mkdir $ETERDESTSRPM" mkdir -p $ETERDESTSRPM || echog "Error mkdir $ETERDESTSRPM"
chmod ug+rw $LISTBUILT chmod ug+rw $LISTBUILT
cp -fv $LISTBUILT $ETERDESTSRPM || echog "Error during copying" mv -fv $LISTBUILT $ETERDESTSRPM || echog "Error during copying"
make_md5sum "$ETERDESTSRPM" make_md5sum "$ETERDESTSRPM"
# Publish tarball if target dir is exist # Publish tarball if target dir is exist
if [ -d "$ETERDESTSRPM/tarball" ] ; then if [ -d "$ETERDESTSRPM/tarball" ] ; then
......
...@@ -32,7 +32,7 @@ phelp() ...@@ -32,7 +32,7 @@ phelp()
echog " -i - install built packages in test hasher (via loginhsh -t)" echog " -i - install built packages in test hasher (via loginhsh -t)"
echog "Ext. options:" echog "Ext. options:"
echog " -c - build without stuff (previous built packages)" echog " -c - build without stuff (previous built packages)"
echog " -s - sign and and copy to upload dir (ETERDESTSRPM) after build" echog " -s - sign (and move to dir ETERDESTSRPM if defined) after build"
echog " -t - make temporary commit before build (rpmbb like behavior)" echog " -t - make temporary commit before build (rpmbb like behavior)"
echog " -l - lazy cleanup (clean before build, not after)" echog " -l - lazy cleanup (clean before build, not after)"
echog " -f - force tag set (see rpmbs --help)" echog " -f - force tag set (see rpmbs --help)"
......
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