File 03-osc_gnome_keyring.patch of Package osc

Overview Repositories Revisions Requests Users Attributes Meta

File 03-osc_gnome_keyring.patch of Package osc (Revision 06a2ef8f15e6342da75f2b9a499a9da3)

Currently displaying revision 06a2ef8f15e6342da75f2b9a499a9da3 , Show latest

diff --git a/osc/conf.py b/osc/conf.py
index 1384ab3..57fbbcc 100644
--- a/osc/conf.py
+++ b/osc/conf.py
@@ -64,28 +64,46 @@ except ImportError:
 from . import OscConfigParser
 from osc import oscerr
 from .oscsslexcp import NoSecureSSLError
+import getpass
 
 GENERIC_KEYRING = False
-GNOME_KEYRING = False
+GNOME_KEYRING = True
 
-try:
-    import keyring
-    GENERIC_KEYRING = True
-except:
-    try:
-        import gobject
-        gobject.set_application_name('osc')
-        import gnomekeyring
-        if os.environ['GNOME_DESKTOP_SESSION_ID']:
-            # otherwise gnome keyring bindings spit out errors, when you have
-            # it installed, but you are not under gnome
-            # (even though hundreds of gnome-keyring daemons got started in parallel)
-            # another option would be to support kwallet here
-            GNOME_KEYRING = gnomekeyring.is_available()
-    except:
-        pass
+import gobject
+gobject.set_application_name('osc')
+import gnomekeyring
 
 
+def gkr_setup():
+    if os.environ.has_key('DBUS_SESSION_BUS_ADDRESS'):
+        # otherwise gnome keyring bindings spit out errors, when you have         +        # it installed, but you are not under gnome
+        # (even though hundreds of gnome-keyring daemons got started in parallel)
+        # another option would be to support kwallet here                         +        GNOME_KEYRING = gnomekeyring.is_available()
+
+        try:
+            info = gnomekeyring.get_info_sync('login')
+            if info.get_is_locked():
+                print ("GNOME login keyring needs to be unlocked:")
+                password = getpass.getpass("Keyring password: ")
+
+                gnomekeyring.unlock_sync('login', password)
+
+
+        except gnomekeyring.NoSuchKeyringError:
+            print ("GNOME keyring does not exist yet.  You must enter a password to encrypt the ")
+            print ("keyring with.")
+            print ()
+            password = getpass.getpass("New keyring password: ")
+
+            gnomekeyring.create_sync('login', password)
+    else:
+        print ("The DBUS_SESSION_BUS_ADDRESS environment variable is not set which")
+        print ("probably means that DBUS is not running.")
+        print ()
+        print ("If you have just installed install osc then you will need to logout")
+        print ("and login again, or source /etc/profile.")
+        exit(1)
+
 def _get_processors():
     """
     get number of processors (online) based on
@@ -825,6 +843,11 @@ def get_config(override_conffile=None,
     """do the actual work (see module documentation)"""
     global config
 
+    gkr_setup()
+    if not GNOME_KEYRING:
+        print ("GNOME Keyring isn't available.  Is DBUS_SESSION_BUS_ADDRESS set?")
+        sys.exit(1)
+
     if not override_conffile:
         conffile = identify_conf()
     else:

Places

File 03-osc_gnome_keyring.patch of Package osc (Revision 06a2ef8f15e6342da75f2b9a499a9da3)

Places