Changeset 19473

Timestamp:

Sep 10, 2008, 1:55:54 PM (18 years ago)

Author:

bills

Message:

Set needed variables before returning from eval block. Fix typo in error
message.

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (3 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.84 2008-09-09 02:18:47 jhoblitt Exp $
+# $Id: Server.pm,v 1.85 2008-09-10 23:55:54 bills Exp $
 
 package Nebulous::Server;
@@ -1185 +1185 @@
                 # find it, fall back to any volume
                 if ($soft_volume) {
-                    return $self->_get_storage_volume;
+                    ($vol_id, $vol_host, $vol_path, $xattr) = $self->_get_storage_volume;
+                    return; # this just returns out of the eval not from the subroutine
                 }
                 $log->logdie("storage volume: $name is not available");
@@ -1245 +1246 @@
         unless ($rows > 0) {
             $query->finish;
-            $log->logdie("can't find a suitable storage volume to replicate $key too");
+            $log->logdie("can't find a suitable storage volume to replicate $key to");
         }
         # when matching by name we shouldn't ever match more than once