Merge lp:~stolowski/libunity/fix-module-open into lp:libunity

[Paweł Stołowski]

Check actual return value of GLib.Module.open to avoid assertion errors and fail early rather than on get_version check later.

Check actual return value of GLib.Module.open to avoid assertion errors and fail early rather than on get_version check later.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~stolowski/libunity/fix-module-open]

291. By Paweł Stołowski on 2013-09-09

Changed variable name. Report error details when Module.open fails.

[Michal Hruby (mhr3)]

Better error reporting is always great ;)

review: Approve

=== modified file 'src/unity-scope-loader.vala'
--- src/unity-scope-loader.vala	2013-08-06 08:09:15 +0000
+++ src/unity-scope-loader.vala	2013-09-09 13:56:25 +0000
@@ -36,33 +36,33 @@
   {
   }
 
-  public virtual List<Unity.AbstractScope> get_scopes (string module, string? module_type) throws Error
+  public virtual List<Unity.AbstractScope> get_scopes (string module_name, string? module_type) throws Error
   {
-    var mod = GLib.Module.open (module, ModuleFlags.BIND_LAZY);
+    var module = GLib.Module.open (module_name, ModuleFlags.BIND_LAZY);
     if (module == null)
     {
-      throw new GLib.IOError.FAILED (@"Could not load module '$module'");
+      throw new GLib.IOError.FAILED ("Could not load module '%s': %s", module_name, GLib.Module.error());
     }
 
     void *function;
-    if (!mod.symbol ("unity_scope_module_get_version", out function))
+    if (!module.symbol ("unity_scope_module_get_version", out function))
     {
-      throw new GLib.IOError.FAILED (@"Could not find 'get_version' symbol in '$module'");
+      throw new GLib.IOError.FAILED (@"Could not find 'get_version' symbol in '$module_name'");
     }
     var get_version = (GetVersionFunction)function;
     if (get_version () != Unity.SCOPE_API_VERSION)
     {
-      throw new GLib.IOError.FAILED (@"Plugin '$module' is for wrong Scope API version");
+      throw new GLib.IOError.FAILED (@"Plugin '$module_name' is for wrong Scope API version");
     }
 
-    if (!mod.symbol ("unity_scope_module_load_scopes", out function))
+    if (!module.symbol ("unity_scope_module_load_scopes", out function))
     {
-      throw new GLib.IOError.FAILED (@"Could not find 'load_scopes' symbol in '$module'");
+      throw new GLib.IOError.FAILED (@"Could not find 'load_scopes' symbol in '$module_name'");
     }
 
     // Since we're executing code within the module at this point, it
     // should not be unloaded.
-    mod.make_resident ();
+    module.make_resident ();
     var load_scopes = (LoadScopesFunction)function;
     return load_scopes ();
   }