Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
2b1440db
Commit
2b1440db
authored
Mar 11, 2015
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes to previous revision.
parent
33844506
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
db/Image.pm.in
db/Image.pm.in
+4
-3
db/Lease.pm.in
db/Lease.pm.in
+2
-2
No files found.
db/Image.pm.in
View file @
2b1440db
...
...
@@ -1095,7 +1095,8 @@ sub Delete($;$)
DBQueryWarn("lock tables images write, image_versions write, ".
" os_info write, os_info_versions write, ".
" osidtoimageid write, os_submap write, ".
" image_permissions write, node_types read")
" image_permissions write, node_types read, ".
" web_tasks write")
or return -1;
#
...
...
@@ -1118,8 +1119,8 @@ sub Delete($;$)
or goto bad;
DBQueryWarn("delete from images where imageid='
$
imageid
'")
or goto bad;
DBQueryWarn("delete from web_tasks where object_uuid='
$
uuid
'")
or
return -1
;
DBQueryWarn("delete from web_tasks where object_uuid='
$
uuid
'")
or goto bad
;
if ($purge || !$DOPROVENANCE) {
goto bad
...
...
db/Lease.pm.in
View file @
2b1440db
...
...
@@ -447,8 +447,8 @@ sub Delete($) {
my
$
idx
=
$
self
->
idx
();
my
$
uuid
=
$
self
->
uuid
();
DBQueryWarn
(
"delete from web_tasks where uuid='$uuid'"
)
or
return
-
1
;
DBQueryWarn
(
"delete from web_tasks where uuid='$uuid'"
)
or
return
LEASE_ERROR_FAILED
()
;
DBQueryWarn
(
"delete from project_leases where lease_idx=$idx"
)
or
return
LEASE_ERROR_FAILED
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment