From 58ea144016f1c0d47b08698069722c5c8b9d4bf3 Mon Sep 17 00:00:00 2001 From: lissav Date: Mon, 7 Jul 2008 18:29:55 +0000 Subject: [PATCH] add call to Utils->Version git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1841 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/conserver.pm | 2 +- xCAT-server/lib/xcat/plugins/packimage.pm | 3 ++- xCAT-server/lib/xcat/plugins/tabutils.pm | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/conserver.pm b/xCAT-server/lib/xcat/plugins/conserver.pm index 74b8059bc..5367deadc 100644 --- a/xCAT-server/lib/xcat/plugins/conserver.pm +++ b/xCAT-server/lib/xcat/plugins/conserver.pm @@ -22,7 +22,7 @@ my $usage_string= -h|--help Display this usage statement. -v|--version Display the version number."; -my $version_string="Version 2.0"; +my $version_string=xCAT::Utils->Version(); sub handled_commands { return { diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm index 74ef6000b..d1db0f297 100644 --- a/xCAT-server/lib/xcat/plugins/packimage.pm +++ b/xCAT-server/lib/xcat/plugins/packimage.pm @@ -40,7 +40,8 @@ sub process_request { "version|v" => \$version ); if ($version) { - $callback->({info=>["Version 2.0"]}); + my $version = xCAT::Utils->Version(); + $callback->({info=>[$version]}); return; } if ($help) { diff --git a/xCAT-server/lib/xcat/plugins/tabutils.pm b/xCAT-server/lib/xcat/plugins/tabutils.pm index 994e9a2d0..af47a3b42 100644 --- a/xCAT-server/lib/xcat/plugins/tabutils.pm +++ b/xCAT-server/lib/xcat/plugins/tabutils.pm @@ -11,7 +11,7 @@ use xCAT::Schema; use Data::Dumper; use xCAT::NodeRange; use xCAT::Schema; - +use xCAT::Utils; use Getopt::Long; 1; @@ -226,7 +226,8 @@ sub noderm if ($VERSION) { my %rsp; - $rsp->{data}->[0] = "2.0"; + my $version = xCAT::Utils->Version(); + $rsp->{data}->[0] = "$version"; $cb->($rsp); return; } @@ -539,7 +540,8 @@ sub nodech # Version if ($VERSION) { my %rsp; - $rsp->{data}->[0] = "2.0"; + my $version = xCAT::Utils->Version(); + $rsp->{data}->[0] = "$version"; $callback->($rsp); return; } @@ -772,7 +774,8 @@ sub nodels if ($VERSION) { my %rsp; - $rsp->{data}->[0] = "2.0"; + my $version = xCAT::Utils->Version(); + $rsp->{data}->[0] = "$version"; $callback->($rsp); return; }