From 04cdd29bdd9ecc2fc04b7082c297bd6a68770ce4 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Wed, 13 Sep 2017 09:50:54 +0200
Subject: Emacs: Make sure pre-set SSH_AUTH_SOCK exists before using it

---
 emacs/.emacs.d/main.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 0e15840d..cc4e819e 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -833,7 +833,8 @@
 (use-package tramp
   :defer 7
   :config (progn
-            (unless (getenv "SSH_AUTH_SOCK")
+            (unless (and (getenv "SSH_AUTH_SOCK")
+                         (file-exists-p (getenv "SSH_AUTH_SOCK")))
               (setenv "SSH_AUTH_SOCK" (format "/run/user/%s/gnupg/S.gpg-agent.ssh" (user-uid))))
             (setq tramp-default-method "ssh"
                   tramp-default-user-alist '(("\\`su\\(do\\)?\\'" nil "root"))
-- 
cgit 1.4.1