Changeset 20

Timestamp:

09/30/02 11:22:02 (20 years ago)

Author:

sscpbas

Message:

pxeconfig:

Changed some text and removed some obselete code.

Location:

trunk/pxeconfig

Files:

• changelog (modified) (1 diff)
• pxeconfig (modified) (6 diffs)

trunk/pxeconfig/changelog

@@ -1 @@
-Always edit this file when changes are commited::
+Always edit this file when changes are commited:
 
 $Log: changelog,v $
+Revision 1.18  2002/09/30 09:22:02  sscpbas
+pxeconfig:
+  Changed some text and removed some obselete code.
+
 Revision 1.17  2002/09/27 14:47:36  sscpbas
 pxeconfig:

trunk/pxeconfig/pxeconfig

@@ -7 +7 @@
 #
 # CVS info
-#  $Date: 2002/09/27 14:47:36 $
-#  $Revision: 1.10 $
+#  $Date: 2002/09/30 09:22:02 $
+#  $Revision: 1.11 $
 #
 # Copyright (C) 2002
@@ -73 +73 @@
 END='end'
 
-SHORTOPT_LIST='d:n:s:e:f:'
-LONGOPT_LIST=['directory=', 'net=', 'start=', 'end=', 'file=']
+SHORTOPT_LIST='hd:n:s:e:f:'
+LONGOPT_LIST=['help', 'directory=', 'net=', 'start=', 'end=', 'file=']
 
 def select_pxe_configfile():
@@ -220 +220 @@
 def check_cmd_line(binfo):
   if len(binfo.keys()) != 4:
-    print 'Not enough arguments to create the links'
     print __doc__
+    print 'Not enough arguments to create the links!!'
     sys.exit(1)
 
@@ -232 +232 @@
 def check_args(argv, binfo):
   """
-  command line option:
-    -d|--directory <dir>
-      Where <dir> is the directory where the pxe config files reside.
+  This function parses the command line options:
+    argv : a list of command line options.
+    binfo: returning a dict with the netinfo. if used non-interactively
   """
   global PXE_CONF_DIR
@@ -241 +241 @@
     opts, args = getopt.getopt(argv[1:], SHORTOPT_LIST, LONGOPT_LIST)
   except getopt.error, detail:
-    print check_args.__doc__
+    print __doc__
     print detail
     sys.exit(1)
@@ -268 +268 @@
       binfo[FILENAME] = value
 
+    elif opt in ['-h', '--help']:
+      print __doc__
+      sys.exit(0)
+
 
 def main():