Merge branch 'master' into feature/fix-service-info

force2b · Dec 6, 2019 · e94908c · e94908c
2 parents 3f10697 + a233265
commit e94908c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cumulusci/cli/config.py b/cumulusci/cli/config.py
@@ -45,7 +45,8 @@ def get_keychain_key(self):
         try:
             key_from_keyring = keyring.get_password("cumulusci", "CUMULUSCI_KEY")
             has_functioning_keychain = True
-        except Exception:
+        except Exception as e:
+            keychain_exception = e
             key_from_keyring = None
             has_functioning_keychain = False
         # If no key in environment or file, generate one
@@ -57,7 +58,8 @@ def get_keychain_key(self):
                 raise KeychainKeyNotFound(
                     "Unable to store CumulusCI encryption key. "
                     "You can configure it manually by setting the CUMULUSCI_KEY "
-                    "environment variable to a random 16-character string."
+                    "environment variable to a random 16-character string. "
+                    f"ERROR: {keychain_exception}"
                 )
         if has_functioning_keychain and not key_from_keyring:
             keyring.set_password("cumulusci", "CUMULUSCI_KEY", key)