From 042970679fc601dac58dbc27ff3c37676b9bfb45 Mon Sep 17 00:00:00 2001 From: lissav Date: Mon, 7 Jul 2008 19:04:37 +0000 Subject: [PATCH] call Utils->Version git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1844 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/DSHCLI.pm | 3 ++- perl-xCAT/xCAT/PPCmac.pm | 3 ++- perl-xCAT/xCAT/Usage.pm | 35 ++++++++++++++++++----------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm index 41fa98b46..931c21434 100644 --- a/perl-xCAT/xCAT/DSHCLI.pm +++ b/perl-xCAT/xCAT/DSHCLI.pm @@ -3874,7 +3874,8 @@ sub parse_and_run_dcp if ($options{'version'}) { my %rsp; - $rsp->{data}->[0] = "Version 2.0"; + my $version = xCAT::Utils->Version(); + $rsp->{data}->[0] = "$version"; xCAT::MsgUtils->message("I", $rsp, $::CALLBACK); exit(0); } diff --git a/perl-xCAT/xCAT/PPCmac.pm b/perl-xCAT/xCAT/PPCmac.pm index 86bccfbc1..a4e4ab715 100644 --- a/perl-xCAT/xCAT/PPCmac.pm +++ b/perl-xCAT/xCAT/PPCmac.pm @@ -16,7 +16,8 @@ sub parse_args { my %opt = (); my $cmd = $request->{command}; my $args = $request->{arg}; - my @VERSION = qw( 2.0 ); + my $vers = + my @VERSION = qw( 2.1 ); ############################################# # Responds with usage statement diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index fcad48817..70a1c4373 100644 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -3,6 +3,7 @@ package xCAT::Usage; use Getopt::Long; +use xCAT::Utils; #------------------------------------------------------------------------------- =head1 xCAT::Usage @@ -110,24 +111,24 @@ my %usage = ( "Usage: lsslp [-h|--help|-v|--version] lsslp [-V|--verbose][-b ip[,ip..]][-w][-r|-x|-z][-s BPA|MM|IVM|RSA|FSP|HMC]" ); - +my $vers = xCAT::Utils->Version(); my %version = ( - "rnetboot" => "Version 2.0", - "rpower" => "Version 2.0", - "rbeacon" => "Version 2.0", - "rvitals" => "Version 2.0", - "reventlog" => "Version 2.0", - "rinv" => "Version 2.0", - "rsetboot" => "Version 2.0", - "rbootseq" => "Version 2.0", - "rscan" => "Version 2.0", - "rspconfig" => "Version 2.0", - "getmacs" => "Version 2.0", - "mkvm" => "Version 2.0", - "lsvm" => "Version 2.0", - "chvm" => "Version 2.0", - "rmvm" => "Version 2.0", - "lsslp" => "Version 2.0" + "rnetboot" => "$vers", + "rpower" => "$vers", + "rbeacon" => "$vers", + "rvitals" => "$vers", + "reventlog" => "$vers", + "rinv" => "$vers", + "rsetboot" => "$vers", + "rbootseq" => "$vers", + "rscan" => "$vers", + "rspconfig" => "$vers", + "getmacs" => "$vers", + "mkvm" => "$vers", + "lsvm" => "$vers", + "chvm" => "$vers", + "rmvm" => "$vers", + "lsslp" => "$vers" ); #--------------------------------------------------------------------------------