Skip to content
Permalink
Browse files

Fix a regression in buildrpms.sh introduced in #7287

  • Loading branch information
daniviga authored and nyalldawson committed Jun 22, 2018
1 parent 5b7eefa commit 9caeb809fcee466c6c1ebf62b48922f27f2ec4fe
Showing with 10 additions and 10 deletions.
  1. +10 −10 rpm/buildrpms.sh
@@ -137,11 +137,11 @@ then

print_info "Creating source package"
# Build source package
if mock --buildsrpm --spec qgis.spec --sources ./sources \
--define "_relver $relver" \
--define "_version $version" \
--define "_timestamp $timestamp" \
--resultdir=$OUTDIR $mock_args
if ! mock --buildsrpm --spec qgis.spec --sources ./sources \
--define "_relver $relver" \
--define "_version $version" \
--define "_timestamp $timestamp" \
--resultdir=$OUTDIR $mock_args
then
print_error "Creating source package failed"
exit 1
@@ -169,11 +169,11 @@ do :
fi
mkdir $OUTDIR/$arch

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

0 comments on commit 9caeb80

Please sign in to comment.
You can’t perform that action at this time.