Changeset 882

Timestamp:

06/14/16 16:46:48 (9 years ago)

Author:

Kris Deugau

Message:

/dev

Add a safety fence to prevent deleting a container that still has

suballocations.

Tweak the error message handling a little

File:

• trunk/cgi-bin/IPDB.pm (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -3072 +3072 @@
 # explicitly deleting any suballocations of the block to be deleted.
 
+      # See if we have child allocations.  Fail for now.
+      my ($childcount) = $dbh->selectrow_array("SELECT count(*) from allocations where parent_id = ?", undef, $id);
+      if ($childcount) {
+        $msg = '';
+        die "$binfo->{block} still has suballocations\n";
+      }
+
       # get parent info of the block we're deleting
       my $pinfo = getBlockData($dbh, $binfo->{parent_id});
@@ -3238 +3245 @@
     }; # end eval
     if ($@) {
-      $msg .= ": $@";
+      if ($msg) { $msg .= ": $@"; } else { $msg = $@; }
       eval { $dbh->rollback; };
       return ('FAIL', $msg);