Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/common.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cmd

import (
"errors"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -71,7 +70,8 @@ func newKeychain(machine machine.Machine, logger log.Logger, interactive bool) k
FileDir: filepath.Join(machine.HomeDirectory(), ConfigDirectoryName),
FilePasswordFunc: func(s string) (string, error) {
if keychainPassphrase == "" && !interactive {
return "", errors.New("keychain passphrase is required when not running in interactive mode; use the \"--keychain-passphrase\" flag")
// in noninteractive mode empty string as keychainPassphrase accepted
return keychainPassphrase, nil
}

if keychainPassphrase != "" {
Expand Down