[ARVADOS] updated: 80d4b6ebb20393507be7ecd0dcf888ebda623a35

[Git user]

Summary of changes:
 services/api/config/application.default.yml | 4 +---
 services/fuse/arvados_fuse/__init__.py      | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

       via  80d4b6ebb20393507be7ecd0dcf888ebda623a35 (commit)
       via  7df118ca0c58dd65f3ec83e94941976d5073ff45 (commit)
      from  b94b54c25a57a26925eaf739dcf59a4ff94238ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 80d4b6ebb20393507be7ecd0dcf888ebda623a35
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Dec 15 12:16:22 2016 -0500

    8460: Tolerate None where dicts are expected in events.

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 4c1731f..51b0a57 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -377,7 +377,7 @@ class Operations(llfuse.Operations):
         if 'event_type' not in ev:
             return
         with llfuse.lock:
-            new_attrs = ev.get("properties", {}).get("new_attributes", {})
+            new_attrs = (ev.get("properties") or {}).get("new_attributes") or {}
             pdh = new_attrs.get("portable_data_hash")
             # new_attributes.modified_at currently lacks
             # subsecond precision (see #6347) so use event_at
@@ -391,7 +391,7 @@ class Operations(llfuse.Operations):
                 else:
                     item.update()
 
-            oldowner = ev.get("properties", {}).get("old_attributes", {}).get("owner_uuid")
+            oldowner = ((ev.get("properties") or {}).get("old_attributes") or {}).get("owner_uuid")
             newowner = ev.get("object_owner_uuid")
             for parent in (
                     self.inodes.inode_cache.find_by_uuid(oldowner) +

commit 7df118ca0c58dd65f3ec83e94941976d5073ff45
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Dec 15 12:12:47 2016 -0500

    8460: Rearrange erb so it is also syntactically valid YAML.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index b2a1602..c8d2d1d 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -444,6 +444,4 @@ test:
   workbench_address: https://localhost:3001/
   git_repositories_dir: <%= Rails.root.join 'tmp', 'git', 'test' %>
   git_internal_dir: <%= Rails.root.join 'tmp', 'internal.git' %>
-  <% if ENV['ARVADOS_TEST_EXPERIMENTAL_WS'] %>
-  websocket_address: "wss://0.0.0.0:<%= ENV['ARVADOS_TEST_WSS_PORT'] %>/websocket"
-  <% end %>
+  websocket_address: <% if ENV['ARVADOS_TEST_EXPERIMENTAL_WS'] %>"wss://0.0.0.0:<%= ENV['ARVADOS_TEST_WSS_PORT'] %>/websocket"<% else %>false<% end %>

-----------------------------------------------------------------------


hooks/post-receive
--