about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-13 17:38:17 +0000
committerbors <bors@rust-lang.org>2018-12-13 17:38:17 +0000
commitf4a421ee3cf1259f0750ac7fabd19da1d8551e4c (patch)
tree353cd94818d031b16052ab72ab12e32c1197eae2 /src
parent7489ee9c6f92050a12a3a3097df0a7d3737d82ec (diff)
parentb1858677ce3a013fd91c0ad7740ad3ebd0ee4479 (diff)
downloadrust-f4a421ee3cf1259f0750ac7fabd19da1d8551e4c.tar.gz
rust-f4a421ee3cf1259f0750ac7fabd19da1d8551e4c.zip
Auto merge of #56783 - alexcrichton:pinentry-mode, r=Mark-Simulacrum
Add `--pinentry-mode=loopback` to deployment script

Apparently this changed with gpg2 or... something like that?
Diffstat (limited to 'src')
-rw-r--r--src/tools/build-manifest/src/main.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 695ca743089..ea6c7115d39 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -621,7 +621,8 @@ impl Builder {
         let asc = self.output.join(format!("{}.asc", filename));
         println!("signing: {:?}", path);
         let mut cmd = Command::new("gpg");
-        cmd.arg("--no-tty")
+        cmd.arg("--pinentry-mode=loopback")
+            .arg("--no-tty")
             .arg("--yes")
             .arg("--batch")
             .arg("--passphrase-fd").arg("0")