Merge lp:~stolowski/unity-scopes-api/fix-1393382-rtm into lp:unity-scopes-api/rtm-14.09

[Paweł Stołowski]

Catch file exception while iterating over individual scope dirs, so that a single failure doesn't break all other scopes.

Catch file exception while iterating over individual scope dirs, so that a single failure doesn't break all other scopes.

[Michi Henning (michihenning)]

Looks good, thanks!

Very minor fix:

error("could not open scope directory: " + scope_dir + "\n");

The trailing newline shouldn't be there. error() automatically appends a newline. (You need a newline only if you want to force an error message to include a line break explictly.)

review: Needs Fixing

[lp:~stolowski/unity-scopes-api/fix-1393382-rtm]

249. By Paweł Stołowski on 2014-11-19

No need for newline.

[Michi Henning (michihenning)]

Thanks!

review: Approve

[lp:~stolowski/unity-scopes-api/fix-1393382-rtm]

250. By Paweł Stołowski on 2015-01-12

Merged rtm.

251. By Paweł Stołowski on 2015-01-12

Catch ResourceException, not FileException.

[Michi Henning (michihenning)]

Right, thanks!

review: Approve

=== modified file 'scoperegistry/FindFiles.cpp'
--- scoperegistry/FindFiles.cpp	2014-08-28 00:20:56 +0000
+++ scoperegistry/FindFiles.cpp	2015-01-12 17:59:13 +0000
@@ -116,18 +116,26 @@
     auto scope_dirs = find_entries(install_dir, Directory);
     for (auto scope_dir : scope_dirs)
     {
-        auto configs = find_scope_dir_configs(scope_dir, suffix);
-        for (auto config : configs)
+        try
         {
-            auto const it = scopes_seen.find(config.first);
-            if (it != scopes_seen.end())
+            auto configs = find_scope_dir_configs(scope_dir, suffix);
+            for (auto config : configs)
             {
-                error("ignoring second instance of non-unique scope: " + config.second + "\n"
-                      "previous instance: " + it->second);
-                continue;
+                auto const it = scopes_seen.find(config.first);
+                if (it != scopes_seen.end())
+                {
+                    error("ignoring second instance of non-unique scope: " + config.second + "\n"
+                            "previous instance: " + it->second);
+                    continue;
+                }
+                scopes_seen[config.first] = config.second;
+                files.insert(config);
             }
-            scopes_seen[config.first] = config.second;
-            files.insert(config);
+        }
+        catch (ResourceException const& e)
+        {
+            error(e.what());
+            error("could not open scope directory: " + scope_dir);
         }
     }