make_tree_file: add 2fa for gitolite.kernel.org

also correct hour for hour < 10

diff --git a/make_tree_file b/make_tree_file
index 3881959602d167f1a76e05ed3b63c51630b6d026..1e4e39b6d5a44ec1016e9cd68325b2c259a005be 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -3,7 +3,7 @@
 . "$(dirname $0)/common.sh"
 
 # Don't do releases in the wee hours :-)
-h=$(date '+%H')
+h=$(date '+%k')
 (( "$h" < 10 && "$h" > 4 )) && {
        echo "Go back to bed" 1>&2
        exit 1
@@ -12,6 +12,11 @@ h=$(date '+%H')
 eval $(gpg-agent --daemon --enable-ssh-support)
 ssh-add ~/.ssh/ra.kernel.org
 
+if ! ssh git@gitolite.kernel.org 2fa isval; then
+       read -r -p "Yubikey token: " tok
+       ssh git@gitolite.kernel.org 2fa val $tok
+fi
+
 # This means I get the right tag if I finish after midnight
 d=$(date --date "5 hours ago" '+%Y%m%d')
 l="$(git describe --match "v*" --abbrev=0)"