From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 14 Apr 2016 23:35:30 +0000 (+1000)
Subject: make_tree_file: better handling of the kernel.org ssh key
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=4430a8675ef11853e49f9cb4a532a136ebbc6006;p=next-scripts

make_tree_file: better handling of the kernel.org ssh key
---

diff --git a/make_tree_file b/make_tree_file
index 6504f0d..a9cc15b 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -12,7 +12,9 @@ h=$(date '+%k')
 # allow kisskb to use more of ka2
 #ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
 
-ssh-add -t 600 $ssh_key_file || exit 1
+trap "ssh-add -d $ssh_key_file" EXIT
+
+ssh-add $ssh_key_file || exit 1
 
 if ! ssh git@gitolite.kernel.org 2fa isval; then
 	read -r -p "Yubikey token: " tok