[ARVADOS-DEV] updated: 7c80a8b76a2972ef4e42dcc281f46d9e0c8839ea

[git at public.curoverse.com]

Summary of changes:
 jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  7c80a8b76a2972ef4e42dcc281f46d9e0c8839ea (commit)
      from  057ea788a6cfc9c0a5fc02376e0557f4d0529b38 (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 7c80a8b76a2972ef4e42dcc281f46d9e0c8839ea
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Nov 4 09:50:42 2015 -0500

    arvados-api-server-upgrade.sh fix: do not try to chmod the cache
    directory if it doesn't exist. This avoids an error on fresh install.
    Rails will create the cache directory if it doesn't exist.
    
    No issue #

diff --git a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
index edecb21..2fff1e7 100755
--- a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
+++ b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
@@ -81,7 +81,10 @@ chown -R "$WWW_OWNER" $RELEASE_PATH/tmp
 chown -R "$WWW_OWNER" $SHARED_PATH/log
 chown "$WWW_OWNER" $RELEASE_PATH/db/structure.sql
 chmod 644 $SHARED_PATH/log/*
-chmod -R 2775 $RELEASE_PATH/tmp/cache/
+# Rails creates the cache directory if it doesn't exist
+if [[ -d $RELEASE_PATH/tmp/cache/ ]]; then
+  chmod -R 2775 $RELEASE_PATH/tmp/cache/
+fi
 echo "Done."
 
 echo "Running sanity check"

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


hooks/post-receive
--