Skip to content

Commit cd5d045

Browse files
daniviganyalldawson
authored andcommitted
Fix a regression in buildrpms.sh introduced in #7287
1 parent bc43194 commit cd5d045

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

rpm/buildrpms.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ then
137137

138138
print_info "Creating source package"
139139
# Build source package
140-
if mock --buildsrpm --spec qgis.spec --sources ./sources \
141-
--define "_relver $relver" \
142-
--define "_version $version" \
143-
--define "_timestamp $timestamp" \
144-
--resultdir=$OUTDIR $mock_args
140+
if ! mock --buildsrpm --spec qgis.spec --sources ./sources \
141+
--define "_relver $relver" \
142+
--define "_version $version" \
143+
--define "_timestamp $timestamp" \
144+
--resultdir=$OUTDIR $mock_args
145145
then
146146
print_error "Creating source package failed"
147147
exit 1
@@ -169,11 +169,11 @@ do :
169169
fi
170170
mkdir $OUTDIR/$arch
171171

172-
if mock -r $arch --rebuild $OUTDIR/$srpm \
173-
--define "_relver $relver" \
174-
--define "_version $version" \
175-
--define "_timestamp $timestamp" \
176-
--resultdir=$OUTDIR/$arch $mock_args
172+
if ! mock -r $arch --rebuild $OUTDIR/$srpm \
173+
--define "_relver $relver" \
174+
--define "_version $version" \
175+
--define "_timestamp $timestamp" \
176+
--resultdir=$OUTDIR/$arch $mock_args
177177
then
178178
# Add to package list
179179
packages="$packages $(ls $OUTDIR/$arch/*-$version-$relver.*.rpm)"

0 commit comments

Comments
 (0)