Merge lp:~mhr3/libunity/fix-1219792 into lp:libunity

[Michal Hruby]

Make sure libunity-tool doesn't crash when it can't connect to the bus

Make sure libunity-tool doesn't crash when it can't connect to the bus.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:288
http://jenkins.qa.ubuntu.com/job/libunity-ci/109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/109/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

=== modified file 'tools/unity-tool.vala'
--- tools/unity-tool.vala	2013-04-03 11:30:10 +0000
+++ tools/unity-tool.vala	2013-09-02 11:46:25 +0000
@@ -215,24 +215,17 @@
 
         if (Options.benchmark)
         {
-          try
-          {
-            // libunity uses an envvar to add time information, tell dbus
-            // to use that envvar for newly spawned services
-            var conn = Bus.get_sync (BusType.SESSION, null);
-            var env = new HashTable<string, string> (str_hash, str_equal);
-            env["LIBUNITY_TIME_SEARCHES"] = "1";
-            conn.call_sync ("org.freedesktop.DBus",
-                            "/org/freedesktop/DBus",
-                            "org.freedesktop.DBus",
-                            "UpdateActivationEnvironment",
-                            new Variant.tuple ({env}),
-                            null, 0, -1, null);
-          }
-          catch (Error e)
-          {
-            warning ("%s", e.message);
-          }
+          // libunity uses an envvar to add time information, tell dbus
+          // to use that envvar for newly spawned services
+          var conn = Bus.get_sync (BusType.SESSION, null);
+          var env = new HashTable<string, string> (str_hash, str_equal);
+          env["LIBUNITY_TIME_SEARCHES"] = "1";
+          conn.call_sync ("org.freedesktop.DBus",
+                          "/org/freedesktop/DBus",
+                          "org.freedesktop.DBus",
+                          "UpdateActivationEnvironment",
+                          new Variant.tuple ({env}),
+                          null, 0, -1, null);
         }
 
         // Get proxy
@@ -330,6 +323,7 @@
                                       ChannelFlags channel_flags,
                                       out string channel_id,
                                       out Dee.SerializableModel model)
+    throws Error
   {
     ScopeProxy? proxy = null;
     var ml = new MainLoop ();
@@ -346,9 +340,14 @@
       ml.quit ();
     });
     run_with_timeout (ml, 15000);
+    if (proxy == null)
+    {
+      throw new IOError.TIMED_OUT ("Timed out waiting for proxy");
+    }
 
     ml = new MainLoop ();
     string? chan_id = null;
+    Error? outer_error = null;
     Dee.SerializableModel? results_model = null;
     proxy.open_channel.begin (channel_type, channel_flags, null, (obj, res) =>
     {
@@ -359,10 +358,12 @@
       catch (Error err)
       {
         warning ("%s", err.message);
+        outer_error = err;
       }
       ml.quit ();
     });
     run_with_timeout (ml, 15000);
+    if (outer_error != null) throw outer_error;
 
     channel_id = chan_id;
     model = results_model;