diff options
| author | bors <bors@rust-lang.org> | 2018-12-12 15:37:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-12 15:37:54 +0000 |
| commit | dd8fc7dc06dea00afbd365468cf4804f68a3531c (patch) | |
| tree | 03a81d4432a18110bd80455df782096ab483a295 | |
| parent | bd47d6825bf4090517549d33cfef10d3300b4a75 (diff) | |
| parent | 4d5413bc1d5aca13bca630b07505f851a5fe19d5 (diff) | |
| download | rust-dd8fc7dc06dea00afbd365468cf4804f68a3531c.tar.gz rust-dd8fc7dc06dea00afbd365468cf4804f68a3531c.zip | |
Auto merge of #56735 - Mark-Simulacrum:fix-sign, r=alexcrichton
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.
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 896b380f85c..695ca743089 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -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") |