Skip to content

Commit

Permalink
Auto merge of #56735 - Mark-Simulacrum:fix-sign, r=alexcrichton
Browse files Browse the repository at this point in the history
Fix gpg signing in manifest builder

GPG versions 2.x+ require that --batch be passed if --passphrase-fd is
to be accepted.

From the man page:

       --passphrase-fd n
              Read  the passphrase from file descriptor n. Only the first line
              will be read from file descriptor n. If you use  0  for  n,  the
              passphrase  will  be  read  from STDIN. This can only be used if
              only one passphrase is supplied.

              Note that this passphrase is only used if the option --batch has
              also been given.  This is different from GnuPG version 1.x.
  • Loading branch information
bors committed Dec 12, 2018
2 parents bd47d68 + 4d5413b commit dd8fc7d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,7 @@ impl Builder {
let mut cmd = Command::new("gpg");
cmd.arg("--no-tty")
.arg("--yes")
.arg("--batch")
.arg("--passphrase-fd").arg("0")
.arg("--personal-digest-preferences").arg("SHA512")
.arg("--armor")
Expand Down

0 comments on commit dd8fc7d

Please sign in to comment.