Anonymous avatar Anonymous committed 857f5dd

Use returncode 2 when keyring cancelled.

Comments (0)

Files changed (1)

 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):
     
 if __name__ == '__main__':
 
-    ret = main()
-    _exit(int(not ret))
+    try:
+        ret = int(not main())
+    except gk.CancelledError:
+        ret = 2
+    _exit(ret)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.