[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/apps/admin: pvfs2-genconfig

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/apps/admin
In directory parlweb1:/tmp/cvs-serv30753

Modified Files:
	pvfs2-genconfig 
Log Message:
update argument checking in pvfs2-genconfig to relax the requirement for
--protocol if --quiet, --iospec, and --metaspec are used


Index: pvfs2-genconfig
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/apps/admin/pvfs2-genconfig,v
diff -p -u -r1.78 -r1.79
--- pvfs2-genconfig	18 Feb 2008 17:00:53 -0000	1.78
+++ pvfs2-genconfig	2 Apr 2008 23:46:04 -0000	1.79
@@ -1326,14 +1326,14 @@ GetOptions('protocol=s'    => \$opt_prot
 
 if($opt_quiet)
 {
-    # quiet requires a protocol
-    die "Invalid arguments.  See -h for help\n" if(!$opt_protocol);
-
-    if(!($opt_iospec || $opt_metaspec))
+    if(
+        !($opt_protocol && $opt_ioservers && $opt_metaservers) 
+        &&
+        !($opt_iospec && $opt_metaspec)
+    )
     {
-        # quiet requires io servers and meta servers to be specified
-        die "Invalid arguments.  See -h for help\n" if(!$opt_ioservers);
-        die "Invalid arguments.  See -h for help\n" if(!$opt_metaservers);
+        # quiet requires full specification of server addresses somehow
+        die "Invalid arguments for --quiet usage.  See -h for help\n";
     }
 }
 else