Changeset 135 for trunk

Timestamp:

04/14/09 16:18:00 (14 years ago)

Author:

bas

Message:

pxeconfig.in:

• some more improvements and code deletion

File:

• trunk/pxeconfig.in (modified) (4 diffs)

trunk/pxeconfig.in

@@ -157 +157 @@
         return files[index-1]
 
-def manage_links(dict, options):
+def manage_links(haddr, options):
         """
         Create the links in the PXE_CONF_DIR,
@@ -164 +164 @@
         """
         if options.VERBOSE:
-                print 'manage_links()'
+                print 'manage_links(%s)' %(haddr)
         
         os.chdir(PXE_CONF_DIR)
-        naddr = dict[NETWORK]
         pxe_filename = options.filename
         
-        for i in range(dict[START], dict[END]+1):
-                haddr = '%s%02X' %(naddr, i) 
-        
-                if options.REMOVE:
-                        if options.DEBUG or options.DRY_RUN:
-                                print 'removing %s/%s' %(PXE_CONF_DIR, haddr)
-
-                        if os.path.exists(haddr) and not options.DRY_RUN:
-                                os.unlink(haddr)
-
-                else:
-                        if options.DEBUG or options.DRY_RUN:
-                                print 'linking %s to %s' %(haddr, pxe_filename)
-
-                        if not options.DRY_RUN:
-                                if os.path.exists(haddr):
-                                        os.unlink(haddr) 
-                                os.symlink(pxe_filename, haddr)
+        if options.REMOVE:
+                if options.DEBUG or options.DRY_RUN:
+                        print 'removing %s/%s' %(PXE_CONF_DIR, haddr)
+
+                if os.path.exists(haddr) and not options.DRY_RUN:
+                        os.unlink(haddr)
+
+        else:
+                if options.DEBUG or options.DRY_RUN:
+                        print 'linking %s to %s' %(haddr, pxe_filename)
+
+                if not options.DRY_RUN:
+                        if os.path.exists(haddr):
+                                os.unlink(haddr) 
+                        os.symlink(pxe_filename, haddr)
 
 def net_2_hex(net, options):
@@ -263 +259 @@
 
         options, args = parser.parse_args() 
+
+        if not args:
+                print __doc__
+                sys.exit(0)
         
         if options.VERSION:
@@ -300 +300 @@
                 cnet = string.joinfields(net[0:3], '.')
 
-                binfo = dict()
-                binfo[NETWORK] = net_2_hex(cnet, options)
-                binfo[START] = int(net[3])
-                binfo[END] =  int(net[3])
-                manage_links(binfo, options)
+                haddr = '%s%02X' %(net_2_hex(cnet, options), int(net[3])) 
+
+                manage_links(haddr, options)