projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OSM SO master
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwlaunchpadtasklet
/
rift
/
tasklets
/
rwlaunchpad
/
image.py
diff --git
a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
index
b18e304
..
2527aef
100644
(file)
--- a/
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
+++ b/
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
@@
-65,10
+65,11
@@
class ImageUploader(object):
except Exception as e:
raise ImageUploadError("Failed to upload image to catalog: %s" % str(e)) from e
except Exception as e:
raise ImageUploadError("Failed to upload image to catalog: %s" % str(e)) from e
- def upload_image_to_cloud_accounts(self, image_name, image_checksum, cloud_accounts=None):
+ def upload_image_to_cloud_accounts(self, image_name, image_checksum,
project,
cloud_accounts=None):
self._log.debug("uploading image %s to all cloud accounts", image_name)
self._log.debug("uploading image %s to all cloud accounts", image_name)
- upload_job = self._client.create_job_threadsafe(image_name, image_checksum, cloud_accounts)
+ upload_job = self._client.create_job_threadsafe(image_name, image_checksum,
project,
cloud_accounts)
try:
upload_job.wait_until_complete_threadsafe()
except client.UploadJobError as e:
try:
upload_job.wait_until_complete_threadsafe()
except client.UploadJobError as e:
- raise ImageUploadError("Failed to upload image (image_name) to cloud accounts") from e
+ raise ImageUploadError("Failed to upload image " + image_name + " to cloud accounts") from e
+