Author: arkurth
Date: Wed Jan 5 17:07:41 2011
New Revision: 1055531
URL: http://svn.apache.org/viewvc?rev=1055531&view=rev
Log:
VCL-428
Updated DataStructure.pm to return the computer's current or next image name
using the computer's imagerevision data rather than the image data because it
is more accurate.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm?rev=1055531&r1=1055530&r2=1055531&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/blockrequest.pm Wed Jan 5
17:07:41 2011
@@ -133,7 +133,6 @@ sub process {
my $blocktime_end = $self->data->get_blocktime_end();
my $blockrequest_name = $self->data->get_blockrequest_name();
my $blockrequest_owner_id =
$self->data->get_blockrequest_owner_id();
- my $block_group_id =
$self->data->get_blockrequest_group_id();
my $block_group_name =
$self->data->get_blockrequest_group_name();
# Get user info
@@ -538,9 +537,7 @@ sub udpate_block_request_status {
sub clear_blockTimes {
my ($blockTimes_id) = @_;
-
- my ($package, $filename, $line, $sub) = caller(0);
-
+
# Check the arguments
if (!defined($blockTimes_id)) {
notify($ERRORS{'WARNING'}, 0, "blockTimes ID was not
specified");
@@ -578,9 +575,7 @@ sub clear_blockTimes {
sub clear_blockComputers {
my ($blockTimes_id) = @_;
-
- my ($package, $filename, $line, $sub) = caller(0);
-
+
# Check the arguments
if (!defined($blockTimes_id)) {
notify($ERRORS{'WARNING'}, 0, "blockTimes ID was not
specified");