Libertine

Merge lp:~townsend/libertine/use-session-dbus into lp:libertine

use-session-dbus
Merge into devel

Proposed by Christopher Townsend on 2017-01-18

Status:

Merged

Approved by:

Larry Price on 2017-01-18

Approved revision:

378

Merged at revision:

378

Proposed branch:

lp:~townsend/libertine/use-session-dbus

Merge into:

lp:libertine

Diff against target:

101 lines (+25/-26)

3 files modified

python/libertine/LxcContainer.py (+6/-7)
python/libertine/LxdContainer.py (+4/-5)
python/libertine/utils.py (+15/-14)

To merge this branch:

bzr merge lp:~townsend/libertine/use-session-dbus

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Larry Price		2017-01-18	Approve on 2017-01-18
Libertine CI Bot	continuous-integration		Approve on 2017-01-18
Review via email: mp+315055@code.launchpad.net

Commit message

Discover if a session is running and if so, use it's dbus session to start the container manager.

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-01-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/333/rebuild

review: Approve (continuous-integration)

lp:~townsend/libertine/use-session-dbus updated on 2017-01-18

377. By Christopher Townsend on 2017-01-18: Some minor fixes based on review.
378. By Christopher Townsend on 2017-01-18: Merge lp:libertine.

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-01-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/334/rebuild

review: Approve (continuous-integration)

Revision history for this message

Larry Price (larryprice) wrote on 2017-01-18:

lgtm - we'll see how it fares with the snap later

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Christopher Townsend

Libertine Developers

 === modified file 'python/libertine/LxcContainer.py'
 --- python/libertine/LxcContainer.py	2017-01-17 15:41:51 +0000
 +++ python/libertine/LxcContainer.py	2017-01-18 21:08:10 +0000
@@ -157,13 +157,12 @@
          self.window_manager = None
          self.host_info = HostInfo.HostInfo()
--        utils.set_session_dbus_env_var()
--
--        try:
--            bus = dbus.SessionBus()
--            self.lxc_manager_interface = bus.get_object(get_lxc_manager_dbus_name(), get_lxc_manager_dbus_path())
--        except dbus.exceptions.DBusException:
--            pass
++        if utils.set_session_dbus_env_var():
++            try:
++                bus = dbus.SessionBus()
++                self.lxc_manager_interface = bus.get_object(get_lxc_manager_dbus_name(), get_lxc_manager_dbus_path())
++            except dbus.exceptions.DBusException:
++                pass
      def timezone_needs_update(self):
          with open(os.path.join(self.root_path, 'etc', 'timezone'), 'r') as fd:
 === modified file 'python/libertine/LxdContainer.py'
 --- python/libertine/LxdContainer.py	2017-01-17 21:46:43 +0000
 +++ python/libertine/LxdContainer.py	2017-01-18 21:08:10 +0000
@@ -295,6 +295,7 @@
          self._host_info = HostInfo.HostInfo()
          self._container = None
          self._matchbox_pid = None
++        self._manager = None
          if not _setup_lxd():
              raise Exception("Failed to setup lxd.")
@@ -303,15 +304,13 @@
          self._window_manager = None
          try:
--            utils.set_session_dbus_env_var()
++            if utils.set_session_dbus_env_var():
++                bus = dbus.SessionBus()
++                self._manager = bus.get_object(get_lxd_manager_dbus_name(), get_lxd_manager_dbus_path())
          except PermissionError as e:
              utils.get_logger().warning("Failed to set dbus session env var")
--        try:
--            bus = dbus.SessionBus()
--            self._manager = bus.get_object(get_lxd_manager_dbus_name(), get_lxd_manager_dbus_path())
          except dbus.exceptions.DBusException:
              utils.get_logger().warning("D-Bus Service not found.")
--            self._manager = None
      def create_libertine_container(self, password=None, multiarch=False):
          if self._try_get_container():
 === modified file 'python/libertine/utils.py'
 --- python/libertine/utils.py	2017-01-17 18:34:57 +0000
 +++ python/libertine/utils.py	2017-01-18 21:08:10 +0000
@@ -17,6 +17,7 @@
  import logging
  import os
++import psutil
  import shlex
  import subprocess
  import xdg.BaseDirectory as basedir
@@ -189,20 +190,20 @@
  def set_session_dbus_env_var():
--    if not 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
--        dbus_session_path = os.path.join('/', 'run', 'user', str(os.getuid()), 'dbus-session')
--
--        if os.path.exists(dbus_session_path):
--            with open(dbus_session_path, 'r') as fd:
--                dbus_session_str = fd.read()
--
--                os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_session_str.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
--
--                return True
--        else:
--            return False
--
--    return True
++    dbus_session_set = 'SESSION' in os.environ
++
++    if not dbus_session_set:
++        for p in psutil.process_iter():
++            if p.name() == 'unity8' or p.name() == 'compiz':
++                p_environ = subprocess.check_output(["cat", "/proc/{}/environ".format(p.pid)])
++                for line in p_environ.decode().split('\0'):
++                    if line.startswith('DBUS_SESSION_BUS_ADDRESS'):
++                        os.environ['DBUS_SESSION_BUS_ADDRESS'] = line.partition('DBUS_SESSION_BUS_ADDRESS=')[2].rstrip('\n')
++                        dbus_session_set = True
++                        break
++                break
++
++    return dbus_session_set
  def is_snap_environment():

Libertine

Merge lp:~townsend/libertine/use-session-dbus into lp:libertine

Commit message

Description of the change

Preview Diff

Subscribers