From d0d21c0a14613f6d775d20540dc3e6d8e8857e4c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 21 Aug 2008 19:32:27 +0000 Subject: * slxconfig and slxos-plugin now treat the name 'default' as an alias for '<<>>', which spares us all unnecessary typing ;-) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2073 95ad53e4-c205-0410-b2fa-d234c58c8868 --- config-db/slxconfig | 5 ++++- os-plugins/slxos-plugin | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/config-db/slxconfig b/config-db/slxconfig index bd0ca6bd..9a29d1c5 100755 --- a/config-db/slxconfig +++ b/config-db/slxconfig @@ -977,7 +977,7 @@ sub changeClientInConfigDB "you have to specify the name of the client you'd like to change!\n" ); } - + my @clientKeys = $openslxDB->getColumnsOfTable('client'); push @clientKeys, 'systems', 'add-systems', 'remove-systems'; my @clientAttrKeys = OpenSLX::AttributeRoster->getClientAttrs(); @@ -1443,6 +1443,9 @@ sub _cleanName return $1; } + # for convenience, we alias default to <<>> + $name = '<<>>' if $name eq 'default'; + return $name; } diff --git a/os-plugins/slxos-plugin b/os-plugins/slxos-plugin index eb350320..182a3b33 100755 --- a/os-plugins/slxos-plugin +++ b/os-plugins/slxos-plugin @@ -132,6 +132,9 @@ if ($action =~ m[^list-at]i) { } my $vendorOSName = shift @ARGV; + # for convenience, we alias default to <<>> + $vendorOSName = '<<>>' if $vendorOSName eq 'default'; + # we chdir into the script's folder such that all relative paths have # a known starting point: chdir($FindBin::RealBin) @@ -194,6 +197,9 @@ if ($action =~ m[^list-at]i) { my $vendorOSName = shift @ARGV; my $pluginAttrs = parsePluginAttrs(1); + # for convenience, we alias default to <<>> + $vendorOSName = '<<>>' if $vendorOSName eq 'default'; + # we chdir into the script's folder such that all relative paths have # a known starting point: chdir($FindBin::RealBin) @@ -230,6 +236,10 @@ if ($action =~ m[^list-at]i) { pod2usage(2); } my $vendorOSName = shift @ARGV; + + # for convenience, we alias default to <<>> + $vendorOSName = '<<>>' if $vendorOSName eq 'default'; + my $pluginAttrs = parsePluginAttrs(0); # we chdir into the script's folder such that all relative paths have -- cgit v1.2.3-55-g7522