# HG changeset patch
# User "Sam Bull <sam@sambull.org>"
# Date 1345629559 -3600
#      Wed Aug 22 10:59:19 2012 +0100
# Node ID 857f5ddd2cea664ac979e648d68dddb02a40ef87
# Parent  72870f737536223c9c064d9d36a103e6f43f37c7
Use returncode 2 when keyring cancelled.

diff --git a/gnome-encfs b/gnome-encfs
--- a/gnome-encfs
+++ b/gnome-encfs
@@ -155,7 +155,8 @@
 def _exit(ec):
     """Exit with additional check if autostart file is still needed."""
 
-    _autostart(_get_items(amount="y"))
+    if ec != 2:
+        _autostart(_get_items(amount="y"))
     sys.exit(ec)
 
 def _proceed(msg):
@@ -420,5 +421,8 @@
     
 if __name__ == '__main__':
 
-    ret = main()
-    _exit(int(not ret))
+    try:
+        ret = int(not main())
+    except gk.CancelledError:
+        ret = 2
+    _exit(ret)