Merge lp:~ricmm/platform-api/no-abort-default-dummy into lp:platform-api

[Ricardo Mendoza]

Dont abort on soft errors, instead fall back to dummy provider if possible.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/platform-api-ci/414/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/414/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM, no regressions on touch.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-03 11:58:47 +0000
+++ CMakeLists.txt	2015-03-06 13:05:06 +0000
@@ -4,7 +4,7 @@
 
 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
 set(UBUNTU_PLATFORM_API_VERSION_MINOR 8)
-set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
+set(UBUNTU_PLATFORM_API_VERSION_PATCH 1)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-03 11:59:30 +0000
+++ debian/changelog	2015-03-06 13:05:06 +0000
@@ -1,3 +1,9 @@
+platform-api (2.8.1) UNRELEASED; urgency=medium
+
+  * Stop aborting on soft errors, fallback to dummy provider instead.
+
+ -- Ricardo Mendoza <[e-mail]>  Fri, 06 Mar 2015 14:00:04 +0100
+
 platform-api (2.8.0+15.04.20150203-0ubuntu1) vivid; urgency=medium
 
   [ Ricardo Mendoza ]

=== modified file 'src/ubuntu/application/base_module.h'
--- src/ubuntu/application/base_module.h	2015-02-03 11:58:47 +0000
+++ src/ubuntu/application/base_module.h	2015-03-06 13:05:06 +0000
@@ -29,7 +29,7 @@
 
 #define API_VERSION_MAJOR   "2"
 #define API_VERSION_MINOR   "8"
-#define API_VERSION_PATCH   "0"
+#define API_VERSION_PATCH   "1"
 #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
 
 namespace internal
@@ -51,28 +51,32 @@
             if (cache == NULL) {
                 FILE *conf;
                 conf = fopen("/etc/ubuntu-platform-api/application.conf", "r");
-                if (conf == NULL) {
-                    exit_module("Unable to find module configuration file");
-                } else {
-                    if (fgets(module_name, 32, conf))
+                if (conf != NULL) {
+                    if (fgets(module_name, 32, conf)) {
                         cache = module_name;
+                        // Null terminate module blob
+                        cache[strlen(cache)-1] = '\0';
+                        fclose(conf);
+                    }
                     else
-                        exit_module("Error reading module name from file");
+                        fprintf(stderr, "Error reading module name from file.\n");
                 }
-                // Null terminate module blob
-                cache[strlen(cache)-1] = '\0';
-                fclose(conf);
-            }
-            if (cache == NULL)
-                exit_module("Unable to determine backend");
+            }
+            if (cache == NULL) {
+                // No module available, use dummy.
+                fprintf(stderr, "Unable to select module, using dummy.\n");
+                strcpy(path, override_path());
+            } else {
+                strcpy(path, "libubuntu_application_api_");
+                
+                if (strlen(cache) > MAX_MODULE_NAME)
+                    exit_module("Selected module is invalid");
+                
+                strcat(path, cache);
+                strcat(path, SO_SUFFIX);
+            }
 
-            strcpy(path, "libubuntu_application_api_");
-            
-            if (strlen(cache) > MAX_MODULE_NAME)
-                exit_module("Selected module is invalid");
-            
-            strcat(path, cache);
-            strcat(path, SO_SUFFIX);
+            fprintf(stderr, "Loading module: '%s'\n", path);
         }
 
         return path;
@@ -100,8 +104,13 @@
     static void* dlopen_fn(const char* path, int flags)
     {
         void *handle = dlopen(path, flags);
-        if (handle == NULL)
-            exit_module("Unable to load selected module.");
+        if (handle == NULL) {
+            fprintf(stderr, "Unable to load selected module, using dummy.\n");
+            fprintf(stderr, "Loading module: '%s'\n", override_path());
+            handle = dlopen(override_path(), flags);
+            if (handle == NULL)
+                exit_module("Dummy module failed to load.");
+        }
 
         return handle;
     }

=== modified file 'src/ubuntu/application/desktop/module_version.h'
--- src/ubuntu/application/desktop/module_version.h	2015-02-03 11:58:47 +0000
+++ src/ubuntu/application/desktop/module_version.h	2015-03-06 13:05:06 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
 #define MODULE_VERSION_MINOR  8
-#define MODULE_VERSION_PATCH  0
+#define MODULE_VERSION_PATCH  1

=== modified file 'src/ubuntu/application/testbackend/module_version.h'
--- src/ubuntu/application/testbackend/module_version.h	2015-02-03 11:58:47 +0000
+++ src/ubuntu/application/testbackend/module_version.h	2015-03-06 13:05:06 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
 #define MODULE_VERSION_MINOR  8
-#define MODULE_VERSION_PATCH  0
+#define MODULE_VERSION_PATCH  1

=== modified file 'src/ubuntu/application/touch/module_version.h'
--- src/ubuntu/application/touch/module_version.h	2015-02-03 11:58:47 +0000
+++ src/ubuntu/application/touch/module_version.h	2015-03-06 13:05:06 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
 #define MODULE_VERSION_MINOR  8
-#define MODULE_VERSION_PATCH  0
+#define MODULE_VERSION_PATCH  1