Merge lp:~townsend/libertine/refresh-libertine-scope into lp:libertine

[Christopher Townsend]

Invalid Libertine Scope results after successfully installing or removing a package.

I tried to use the Python dbus module, but trying to find a simple way to just send a signal is not trivial. I was spending too much time trying to figure that out when the solution proposed here works.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:245
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/259/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/262
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/221
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/221
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/221
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/221
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1157/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/259/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

Should we also send a signal when we create/destroy containers?

Also see inline comments.

review: Needs Information

[lp:~townsend/libertine/refresh-libertine-scope]

246. By Christopher Townsend on 2016-06-15

A few changes based on feedback.

[Christopher Townsend (townsend)]

> Should we also send a signal when we create/destroy containers?
For destroying, definitely yes since there are probably packages installed and they will get wiped.

For creating, well, there won't be any new packages on a freshly created container, but I guess it won't hurt.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:246
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/260/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/263
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/222
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/222
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/222
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/222
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1158/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/260/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

Works great, lgtm!

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-06-02 18:57:43 +0000
+++ debian/control	2016-06-15 15:57:52 +0000
@@ -43,7 +43,8 @@
 
 Package: libertine-tools
 Architecture: any
-Depends: lsb-release,
+Depends: libglib2.0-bin,
+         lsb-release,
          python3-apt,
          python3-distro-info,
          python3-libertine,

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2016-06-14 20:22:33 +0000
+++ python/libertine/utils.py	2016-06-15 15:57:52 +0000
@@ -19,6 +19,7 @@
 import json
 import os
 import psutil
+import shlex
 import subprocess
 import xdg.BaseDirectory as basedir
 
@@ -150,3 +151,14 @@
 
     window_manager.terminate()
     window_manager.wait()
+
+
+def refresh_libertine_scope():
+    scopes_object_path = "/com/canonical/unity/scopes"
+    invalidate_signal = "com.canonical.unity.scopes.InvalidateResults"
+    libertine_scope_id = "libertine-scope.ubuntu_libertine-scope"
+
+    gdbus_cmd = ("gdbus emit --session --object-path %s --signal %s %s" %
+                 (scopes_object_path, invalidate_signal, libertine_scope_id))
+
+    subprocess.Popen(shlex.split(gdbus_cmd))

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-06-07 18:23:48 +0000
+++ tools/libertine-container-manager	2016-06-15 15:57:52 +0000
@@ -401,6 +401,8 @@
         sys.exit(1)
     update_container_install_status(args.id, "ready")
 
+    libertine.utils.refresh_libertine_scope()
+
 
 def destroy_container_by_id(id):
     container = LibertineContainer(id)
@@ -419,6 +421,8 @@
 
     destroy_container_by_id(args.id)
 
+    libertine.utils.refresh_libertine_scope()
+
 
 def install_package(args):
     if args.id and not libertine.utils.container_exists(args.id):
@@ -454,6 +458,8 @@
 
     update_package_install_status(args.id, package, "installed")
 
+    libertine.utils.refresh_libertine_scope()
+
 
 def remove_package_by_name(container_id, package_name, verbosity=1, readline=False):
     fallback_status = get_package_install_status(container_id, package_name)
@@ -484,6 +490,8 @@
     if not remove_package_by_name(args.id, args.package, args.verbosity, args.readline):
         sys.exit(1)
 
+    libertine.utils.refresh_libertine_scope()
+
 
 def search_cache(args):
     if args.id and not libertine.utils.container_exists(args.id):