Changeset 27838 for branches/tap_branches/DataStoreServer/scripts/dsprodtool

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• DataStoreServer/scripts/dsprodtool (modified) (5 diffs)

branches/tap_branches/DataStoreServer/scripts/dsprodtool

@@ -38 +38 @@
 my $dsroot;
 my $dbname;
+my $dbserver;
 my $dbpass;
 
@@ -61 +62 @@
         'ps7=s'         =>      \$ps7,
         'dbname=s'      =>      \$dbname,
+        'dbserver=s'    =>      \$dbserver,
         'dsroot=s'      =>      \$dsroot,
 ) or pod2usage(2);
@@ -67 +69 @@
 
 # will exit if neither or both -add and -del were specified
-$err .= "Must specify either --add or --del.\n"
+show_usage( "Must specify either --add or --del.")
     unless $add xor $del;
 
@@ -79 +81 @@
     }
 
-} else {
+} elsif ($del) {
     $product = $del;
     if (! -t STDIN) {
@@ -124 +126 @@
     if ($err);
 
-my $dbserver = metadataLookupStr($siteConfig, 'DS_DBSERVER');
+$dbserver = metadataLookupStr($siteConfig, 'DS_DBSERVER') 
+    unless defined $dbserver;
 $dbname      = metadataLookupStr($siteConfig, 'DS_DBNAME')
     unless defined $dbname;