Commit 2b1440db authored by Leigh B Stoller's avatar Leigh B Stoller

Fixes to previous revision.

parent 33844506
...@@ -1095,7 +1095,8 @@ sub Delete($;$) ...@@ -1095,7 +1095,8 @@ sub Delete($;$)
DBQueryWarn("lock tables images write, image_versions write, ". DBQueryWarn("lock tables images write, image_versions write, ".
" os_info write, os_info_versions write, ". " os_info write, os_info_versions write, ".
" osidtoimageid write, os_submap write, ". " osidtoimageid write, os_submap write, ".
" image_permissions write, node_types read") " image_permissions write, node_types read, ".
" web_tasks write")
or return -1; or return -1;
# #
...@@ -1118,8 +1119,8 @@ sub Delete($;$) ...@@ -1118,8 +1119,8 @@ sub Delete($;$)
or goto bad; or goto bad;
DBQueryWarn("delete from images where imageid='$imageid'") DBQueryWarn("delete from images where imageid='$imageid'")
or goto bad; or goto bad;
DBQueryWarn("delete from web_tasks where object_uuid='$uuid'") or DBQueryWarn("delete from web_tasks where object_uuid='$uuid'")
return -1; or goto bad;
if ($purge || !$DOPROVENANCE) { if ($purge || !$DOPROVENANCE) {
goto bad goto bad
......
...@@ -447,8 +447,8 @@ sub Delete($) { ...@@ -447,8 +447,8 @@ sub Delete($) {
my $idx = $self->idx(); my $idx = $self->idx();
my $uuid = $self->uuid(); my $uuid = $self->uuid();
DBQueryWarn("delete from web_tasks where uuid='$uuid'") or DBQueryWarn("delete from web_tasks where uuid='$uuid'")
return -1; or return LEASE_ERROR_FAILED();
DBQueryWarn("delete from project_leases where lease_idx=$idx") DBQueryWarn("delete from project_leases where lease_idx=$idx")
or return LEASE_ERROR_FAILED(); or return LEASE_ERROR_FAILED();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment