Skip to content

Commit 8f88e3b

Browse files
committed
Change hack for detecting bs_worker builds
Also touch the /.build.packages/same_result_marker file like expected by the worker.
1 parent a4b420d commit 8f88e3b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

build-recipe-spec

+5-5
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,11 @@ recipe_compare_oldpackages() {
370370
echo "... comparing built packages with the former built"
371371
if chroot $BUILD_ROOT /usr/lib/build/same-build-result.sh /.build.oldpackages "$TOPDIR/RPMS" "$TOPDIR/SRPMS"; then
372372
chroot $BUILD_ROOT touch /.build/.same_result_marker
373-
# XXX: dirty build service hack. fix bs_worker. Search for
374-
# 'same_result_marker' for traces of a first try to get rid of this
375-
if test -n "$REASON" -a -n "$DISTURL" ; then
376-
exitcode=2
377-
fi
373+
chroot $BUILD_ROOT touch /.build.packages/same_result_marker
374+
# dirty build service hack. return exit status 2 to bs_worker for unchanged builds
375+
case "$REASON" in
376+
Building\ *\ for\ project\ *\ repository\ *\ srcmd5\ *) exitcode=2 ;;
377+
esac
378378
fi
379379
fi
380380
}

0 commit comments

Comments
 (0)