buildout-scripts/*obs.sh: Improve the mechanism to restore the backed up bin/buildout.

obs/generic/TODO.txt

@@ -4,6 +4,7 @@ Document the project.
 Do not rename the plugin library (libfluentbit-wendelin.so to fluentbit-wendelin.so). The fix first has to be made upstream (in the metadata-collect-agent project).
 
 MID TERM
+Add a fonction in build-scripts/configuration-information.sh to delete the go/ directory?
 Re-add networkcached to the building process.
 Use a ./configure script?
 - In particular, in $ARCHIVE_NAME/Makefile there are some operations which should be in the template stage.

obs/generic/build-scripts/clean_obs.sh

@@ -3,6 +3,14 @@ set -e
 
 source build-scripts/configuration_information.sh
 
+# reverse the action of obsoleting the potentially altered buildout and restoring the backed up one
+if [ ! -e $RUN_BUILDOUT_DIR/bin/backup.buildout ]; then
+	cp $RUN_BUILDOUT_DIR/bin/buildout $RUN_BUILDOUT_DIR/bin/backup.buildout
+fi
+if [ -e $RUN_BUILDOUT_DIR/bin/old.buildout ]; then
+	mv $RUN_BUILDOUT_DIR/bin/old.buildout $RUN_BUILDOUT_DIR/bin/buildout
+fi
+
 TMP_TARGET=$INITIAL_DIR/obs-tmp/$SOFTWARE_NAME
 TMP_TARGET=`realpath -m $TMP_TARGET`
 rm -rf $TMP_TARGET

obs/generic/build-scripts/obs.sh

@@ -14,7 +14,8 @@ cp $COMPILATION_TEMPLATES_DIR/tmp/$SOFTWARE_NAME/Makefile $TARBALL_DIR/Makefile
 echo $TARBALL_DIR > $TARBALL_DIR/local_build_directory
 # restore bin/buildout
 # note: when installing python, buildout "rebootstrap" itself to use the installed python: it would fail on OBS' VM
-mv $RUN_BUILDOUT_DIR/bin/backup.buildout $RUN_BUILDOUT_DIR/bin/buildout
+cp $RUN_BUILDOUT_DIR/bin/buildout $RUN_BUILDOUT_DIR/bin/old.buildout
+cp $RUN_BUILDOUT_DIR/bin/backup.buildout $RUN_BUILDOUT_DIR/bin/buildout
 
 # clean the parts directory
 rm -rf $RUN_BUILDOUT_DIR/{.installed.cfg,parts/}