Merge pull request #81 from essentialkaos/develop

Version 2.7.1

SOURCES/libexec/build-remote.shx

@@ -686,6 +686,10 @@ sshCommand() {
   local ssh_opts
   ssh_opts=$(getSSHOpts)
 
+  if [[ -n "$key" ]] ; then
+    no_pass=true
+  fi
+
   if [[ -n "$pass" && -z "$no_pass" ]] ; then
     sshpass -p "$pass" ssh $SSH_BASE_OPTS -t -t -q $ssh_opts "$host" "$comm"
   else

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

SOURCES/rpmbuilder

@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.7.0"
+VER="2.7.1"
 
 ################################################################################
 
@@ -526,6 +526,11 @@ if [[ -n "$PREFS_FILE" && -r "$PREFS_FILE" ]] ; then
   unset arg argn argp
 fi
 
+# Clear some options read from preferences file for tmux worker
+if [[ "$*" =~ "--tmux-worker" ]] ; then
+  unset remote parallel
+fi
+
 ## OPTIONS PARSING 5 ###################################################################
 
 if [[ $# -eq 0 ]] ; then

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 <andy@essentialkaos.com> - 2.7.1-0
+- Fixed handling --download option with predefined options in preferences file
+
 * Tue Feb 04 2020 Anton Novojilov <andy@essentialkaos.com> - 2.7.0-0
 - Updated options parser to the latest version
 - Improved preferences parser