[ARVADOS] updated: 5d5375b28437c59f9625d8653ecef4afec1c2120
Git user
git at public.curoverse.com
Fri May 27 17:48:49 EDT 2016
Summary of changes:
build/run-build-packages-one-target.sh | 4 ++--
build/run-build-packages.sh | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
via 5d5375b28437c59f9625d8653ecef4afec1c2120 (commit)
via 3297c7fb97510aeea14df586d81caf65fd6c4aa6 (commit)
from bde564d8ad6f00326c16d7b85ce6dbeec9d338d3 (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 5d5375b28437c59f9625d8653ecef4afec1c2120
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri May 27 17:35:24 2016 -0400
Add dependency for ruamel.yaml to the build list.
No issue #
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index dc428a0..0312bc3 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -94,7 +94,7 @@ case "$TARGET" in
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
'pycurl<7.21.5' contextlib2 pyyaml 'rdflib>=4.2.0' \
- shellescape mistune typing avro)
+ shellescape mistune typing avro ruamel.ordereddict)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client)
;;
debian8)
@@ -108,7 +108,7 @@ case "$TARGET" in
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' \
- shellescape mistune typing avro)
+ shellescape mistune typing avro ruamel.ordereddict)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client)
;;
ubuntu1204)
@@ -122,7 +122,7 @@ case "$TARGET" in
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
contextlib2 'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' \
- shellescape mistune typing avro isodate)
+ shellescape mistune typing avro isodate ruamel.ordereddict)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client)
;;
ubuntu1404)
@@ -134,7 +134,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(pyasn1==0.1.7 pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \
rsa 'pycurl<7.21.5' backports.ssl_match_hostname pyyaml 'rdflib>=4.2.0' \
- shellescape mistune typing avro)
+ shellescape mistune typing avro ruamel.ordereddict)
PYTHON3_BACKPORTS=(docker-py==1.7.2 requests websocket-client)
;;
centos6)
@@ -149,7 +149,8 @@ case "$TARGET" in
ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \
python-daemon lockfile llfuse==0.41.1 'pbr<1.0' pyyaml \
'rdflib>=4.2.0' shellescape mistune typing avro requests \
- isodate pyparsing sparqlwrapper html5lib keepalive)
+ isodate pyparsing sparqlwrapper html5lib keepalive \
+ ruamel.ordereddict)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client)
export PYCURL_SSL_LIBRARY=nss
;;
commit 3297c7fb97510aeea14df586d81caf65fd6c4aa6
Author: Ward Vandewege <ward at curoverse.com>
Date: Fri May 27 17:34:55 2016 -0400
Fix bug in run-build-packages-one-target.sh: make sure to escape the *
passed to find.
No issue #
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 7034e3f..322129e 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -86,11 +86,11 @@ done
set -e
if [[ -n "$test_packages" ]]; then
- if [[ -n "$(find $WORKSPACE/packages/$TARGET -name *.rpm)" ]] ; then
+ if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then
createrepo $WORKSPACE/packages/$TARGET
fi
- if [[ -n "$(find $WORKSPACE/packages/$TARGET -name *.deb)" ]] ; then
+ if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
(cd $WORKSPACE/packages/$TARGET
dpkg-scanpackages . 2> >(grep -v 'warning' 1>&2) | gzip -c > Packages.gz
)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list