Skip to content

Commit b9d359f

Browse files
authored
Don't copy original dsc sources if OBS-DCH-RELEASE set (openSUSE#992)
In that case modified versions will have been generated as part of the build output. So this avoids coping out two dsc sources, which can cause issues for the source service and schedular trigger dependency rebuilds, or publish hook publishing .dsc source package. This has happend since the merge of d995de1 dsc_move_build_result() will copy out both original and new one generated .dsc that is list listed in the .changes files. The .changes files list all the modified sources as well as the packages so can be consider definitive. Closes: 928
1 parent 5f57d9e commit b9d359f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build-recipe-dsc

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ dsc_move_build_result() {
197197
mv "$changes" "$BUILD_ROOT/$TOPDIR/DEBS"
198198
done
199199

200-
if test "$RECIPEFILE" != "debian/control" -a "$RECIPEFILE" != "debian.control" ; then
200+
if test "$RECIPEFILE" != "debian/control" -a "$RECIPEFILE" != "debian.control" -a -z "$OBS_DCH_RELEASE" ; then
201201
# link used sources over to DEB directory
202202
ln $BUILD_ROOT/$DEB_SOURCEDIR/$DEB_DSCFILE $BUILD_ROOT/$TOPDIR/DEBS/
203203
while read f ; do

0 commit comments

Comments
 (0)