From fbba45562a2a5c1a553595b185bb4562bf0ce283 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 5 Feb 2020 00:28:03 +0300 Subject: [PATCH] Fix handling --download option with predefined options in preferences file --- SOURCES/libexec/build.shx | 2 +- SOURCES/rpmbuilder | 2 +- rpmbuilder.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SOURCES/libexec/build.shx b/SOURCES/libexec/build.shx index 69d816d..cc1acc2 100644 --- a/SOURCES/libexec/build.shx +++ b/SOURCES/libexec/build.shx @@ -36,7 +36,7 @@ startBuild() { trap termExit SIGINT SIGQUIT SIGTERM - if [[ -n "$parallel" && $(wc -l "${remote/:*/}" | cut -f1 -d" ") -gt 1 ]] ; then + if [[ -z "$download" && -n "$parallel" && $(wc -l "${remote/:*/}" | cut -f1 -d" ") -gt 1 ]] ; then if [[ "${remote/:*/}" != "$remote" ]] ; then basicBuild "$@" else diff --git a/SOURCES/rpmbuilder b/SOURCES/rpmbuilder index a818354..24c6b4c 100755 --- a/SOURCES/rpmbuilder +++ b/SOURCES/rpmbuilder @@ -13,7 +13,7 @@ fi APP="RPMBuilder" # Utility version (String) -VER="2.7.0" +VER="2.7.1" ################################################################################ diff --git a/rpmbuilder.spec b/rpmbuilder.spec index 2beaac3..5416819 100644 --- a/rpmbuilder.spec +++ b/rpmbuilder.spec @@ -2,7 +2,7 @@ Summary: RPM package build helper Name: rpmbuilder -Version: 2.7.0 +Version: 2.7.1 Release: 0%{?dist} License: EKOL Group: Development/Tools @@ -55,6 +55,9 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Wed Feb 05 2020 Anton Novojilov - 2.7.1-0 +- Fixed handling --download option with predefined options in preferences file + * Tue Feb 04 2020 Anton Novojilov - 2.7.0-0 - Updated options parser to the latest version - Improved preferences parser