From ec92718e66595234536904c80e1d7ab3fd6927d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Feb 2009 19:13:15 +0000 Subject: [PATCH] copy back results alway, also in case of "build compare validates same result". Server has to decide to take it or not. --- build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build b/build index f22bae3..7930f5b 100755 --- a/build +++ b/build @@ -1461,12 +1461,6 @@ if test -n "$RPMS" -a -n "$CREATE_BASELIBS" -a -d "$BUILD_ROOT/$TOPDIR/RPMS" ; t fi fi -if test -n "$RPMS" -a -d "$BUILD_ROOT/$TOPDIR/RPMS" -a -d "$OLD_PACKAGES" -a -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then - echo "... comparing built packages with the former built" - # exit with 2, if packages built successfull, but have no changes to former built packages. - chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh "$OLD_PACKAGES" "$TOPDIR/RPMS" "$TOPDIR/SRPMS" && cleanup_and_exit 2 -fi - # IMPLEMENT ME: place code for creating binary package deltas here if test -n "$RUNNING_IN_VM" -a -n "$VM_SWAP"; then @@ -1475,5 +1469,11 @@ if test -n "$RUNNING_IN_VM" -a -n "$VM_SWAP"; then $BUILD_DIR/extractbuild "$VM_SWAP" || cleanup_and_exit 1 fi +if test -n "$RPMS" -a -d "$BUILD_ROOT/$TOPDIR/RPMS" -a -d "$OLD_PACKAGES" -a -x "$BUILD_ROOT/usr/lib/build/same-build-result.sh" ; then + echo "... comparing built packages with the former built" + # exit with 2, if packages built successfull, but have no changes to former built packages. + chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh "$OLD_PACKAGES" "$TOPDIR/RPMS" "$TOPDIR/SRPMS" && cleanup_and_exit 2 +fi + echo "... build is finished" cleanup_and_exit 0 -- 2.7.4