Improvements

essentialkaos · Feb 4, 2020 · ec2d428 · ec2d428
1 parent 62cbd81
commit ec2d428
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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