From ec2d428d481c9f44da4d71a3b81e207bd0959212 Mon Sep 17 00:00:00 2001
From: Anton Novojilov <andy@essentialkaos.com>
Date: Tue, 4 Feb 2020 16:58:42 +0300
Subject: [PATCH] Improvements

---
 SOURCES/libexec/build-remote.shx | 4 ++++
 SOURCES/rpmbuilder               | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/SOURCES/libexec/build-remote.shx b/SOURCES/libexec/build-remote.shx
index ed8306b..e818b5d 100644
--- a/SOURCES/libexec/build-remote.shx
+++ b/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
diff --git a/SOURCES/rpmbuilder b/SOURCES/rpmbuilder
index 257281c..a818354 100755
--- a/SOURCES/rpmbuilder
+++ b/SOURCES/rpmbuilder
@@ -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