[ARVADOS] updated: b4a79e9c1de2e53acee8850e6d1ef3866aff0d3a

[Git user]

Summary of changes:
 build/package-build-dockerfiles/centos6/Dockerfile | 3 ++-
 build/package-test-dockerfiles/centos6/Dockerfile  | 3 ++-
 build/run-build-packages.sh                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

       via  b4a79e9c1de2e53acee8850e6d1ef3866aff0d3a (commit)
       via  64d7948de09c56afdc2d7b1d9fa002a655eedf65 (commit)
      from  3db1a8bbb9f14799e0aabd12cff3c980c7da0167 (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 b4a79e9c1de2e53acee8850e6d1ef3866aff0d3a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Sep 7 15:58:50 2016 -0400

    9944: Tweak centos6 Dockerfiles to fall back to mirror if repoforge main is
    unavailable.

diff --git a/build/package-build-dockerfiles/centos6/Dockerfile b/build/package-build-dockerfiles/centos6/Dockerfile
index 570dde1..81f1f60 100644
--- a/build/package-build-dockerfiles/centos6/Dockerfile
+++ b/build/package-build-dockerfiles/centos6/Dockerfile
@@ -26,7 +26,8 @@ RUN scl enable python33 "easy_install-3.3 pip" && scl enable python27 "easy_inst
 RUN ln -s /usr/lib64/liblzma.so.0 /usr/lib64/lzma.so.5
 
 RUN cd /tmp && \
-    curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' && \
+    (curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' || \
+     curl -OL 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm') && \
     rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm && \
     sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo
 
diff --git a/build/package-test-dockerfiles/centos6/Dockerfile b/build/package-test-dockerfiles/centos6/Dockerfile
index 874820a..e29bbca 100644
--- a/build/package-test-dockerfiles/centos6/Dockerfile
+++ b/build/package-test-dockerfiles/centos6/Dockerfile
@@ -14,7 +14,8 @@ RUN touch /var/lib/rpm/* && \
     /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
 
 RUN cd /tmp && \
-    curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' && \
+    (curl -OL 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' || \
+     curl -OL 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm') && \
     rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm && \
     sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo
 

commit 64d7948de09c56afdc2d7b1d9fa002a655eedf65
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Sep 7 15:58:13 2016 -0400

    9944: Fix schema-salad 'lockfile' dependency to account for different package
    names between centos & debian/ubuntu.

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 5c78de7..8b7ab88 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -465,7 +465,7 @@ fpm_build lockfile "" "" python 0.12.2 --epoch 1
 # So we build this thing separately.
 #
 # Ward, 2016-03-17
-fpm_build schema_salad "" "" python 1.18.20160907135919 --depends "python-lockfile >= 1:0.12.2-2"
+fpm_build schema_salad "" "" python 1.18.20160907135919 --depends "${PYTHON2_PKG_PREFIX}-lockfile >= 1:0.12.2-2"
 
 # And schema_salad now depends on ruamel-yaml, which apparently has a braindead setup.py that requires special arguments to build (otherwise, it aborts with 'error: you have to install with "pip install ."'). Sigh.
 # Ward, 2016-05-26

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


hooks/post-receive
--