Properly check that DBUS_SESSION_BUS_ADDRESS exists from @alxchk

3gstudent · May 24, 2017 · 43bc0fb · 43bc0fb
1 parent 0e5722c
commit 43bc0fb
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Linux/lazagne/config/homes.py b/Linux/lazagne/config/homes.py
@@ -70,21 +70,27 @@ def sessions(setenv=True):
 
                 if setenv:
                     previous_uid = os.geteuid()
+                    previous = None
                     if not uid == previous_uid:
                         try:
                             os.seteuid(uid)
                         except:
                             continue
 
-                    previous = os.environ['DBUS_SESSION_BUS_ADDRESS']
+                    if 'DBUS_SESSION_BUS_ADDRESS' is os.environ:
+                        previous = os.environ['DBUS_SESSION_BUS_ADDRESS']
+
                     os.environ['DBUS_SESSION_BUS_ADDRESS'] = address
 
                 try:
                     yield (uid, address)
                 finally:
                     if setenv:
-                        os.environ['DBUS_SESSION_BUS_ADDRESS'] = previous
-
+                        if previous:
+                            os.environ['DBUS_SESSION_BUS_ADDRESS'] = previous
+                        else:
+                            del os.environ['DBUS_SESSION_BUS_ADDRESS']
+
                         if previous_uid != uid:
                             try:
                                 os.seteuid(previous_uid)