[ARVADOS] updated: 22c135139279edcf5be0218eb90c375f2433a4b9
git at public.curoverse.com
git at public.curoverse.com
Tue Nov 18 13:40:49 EST 2014
Summary of changes:
sdk/python/setup.py | 4 +++-
.../api/test/functional/arvados/v1/collections_controller_test.rb | 1 +
services/fuse/setup.py | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
via 22c135139279edcf5be0218eb90c375f2433a4b9 (commit)
via b75e2a12f618e2b69f3af1672abfb4773e202bed (commit)
from 84d5db363e4c10881fdb5317b01f46bdc33c002a (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 22c135139279edcf5be0218eb90c375f2433a4b9
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Nov 18 13:40:32 2014 -0500
4552: Set permit_unsigned_manifests=false needed for test.
diff --git a/services/api/test/functional/arvados/v1/collections_controller_test.rb b/services/api/test/functional/arvados/v1/collections_controller_test.rb
index 021918c..0412072 100644
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -576,6 +576,7 @@ EOS
end
test 'Reject manifest with unsigned blob' do
+ permit_unsigned_manifests false
authorize_with :active
unsigned_manifest = ". 0cc175b9c0f1b6a831c399e269772661+1 0:1:a.txt\n"
manifest_uuid = Digest::MD5.hexdigest(unsigned_manifest)
commit b75e2a12f618e2b69f3af1672abfb4773e202bed
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Nov 18 02:36:58 2014 -0500
4400: Silence git error messages during package install (we ignore them anyway)
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 46ca7d2..bc1fab9 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -13,7 +13,9 @@ cmd_opts = {'egg_info': {}}
try:
git_tags = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
- '--format=format:%ct %h', SETUP_DIR]).split()
+ '--format=format:%ct %h', SETUP_DIR],
+ stderr=open('/dev/null','w')
+ ).split()
assert len(git_tags) == 2
except (AssertionError, OSError, subprocess.CalledProcessError):
pass
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 1e72fee..c6f9424 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -13,7 +13,8 @@ cmd_opts = {'egg_info': {}}
try:
git_tags = subprocess.check_output(
['git', 'log', '--first-parent', '--max-count=1',
- '--format=format:%ct %h', SETUP_DIR]).split()
+ '--format=format:%ct %h', SETUP_DIR],
+ stderr=open('/dev/null','w')).split()
assert len(git_tags) == 2
except (AssertionError, OSError, subprocess.CalledProcessError):
pass
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list