projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
9799: Remove duplicate uuids from db queries.
[arvados.git]
/
services
/
api
/
app
/
models
/
container_request.rb
diff --git
a/services/api/app/models/container_request.rb
b/services/api/app/models/container_request.rb
index bf244bd907b4cf2a024ff1ff13e8032ab060bd56..a56c34184d49f7d2374f8cada9f8523f1beb8ac9 100644
(file)
--- a/
services/api/app/models/container_request.rb
+++ b/
services/api/app/models/container_request.rb
@@
-136,7
+136,7
@@
class ContainerRequest < ArvadosModel
select(:portable_data_hash).
first
if !c
select(:portable_data_hash).
first
if !c
- raise A
ctiveRecord::RecordNotFound
.new "cannot mount collection #{uuid.inspect}: not found"
+ raise A
rvadosModel::UnresolvableContainerError
.new "cannot mount collection #{uuid.inspect}: not found"
end
if mount['portable_data_hash'].nil?
# PDH not supplied by client
end
if mount['portable_data_hash'].nil?
# PDH not supplied by client
@@
-154,7
+154,7
@@
class ContainerRequest < ArvadosModel
def container_image_for_container
coll = Collection.for_latest_docker_image(container_image)
if !coll
def container_image_for_container
coll = Collection.for_latest_docker_image(container_image)
if !coll
- raise A
ctiveRecord::RecordNotFound
.new "docker image #{container_image.inspect} not found"
+ raise A
rvadosModel::UnresolvableContainerError
.new "docker image #{container_image.inspect} not found"
end
return coll.portable_data_hash
end
end
return coll.portable_data_hash
end