Changeset 100 for trunk

Timestamp:

08/15/07 08:28:37 (17 years ago)

Author:

bas

Message:

hexls.in:

• added sort function
• also display link information for HEX files that are shorter then 8 digits.

pxeconfigd.in:

• Updated VERSION info

Location:

trunk

Files:

• hexls.in (modified) (3 diffs)
• pxeconfig.in (modified) (1 diff)
• pxeconfigd.in (modified) (1 diff)

trunk/hexls.in

@@ -40 +40 @@
         '''list directory, convert hexadecimal to dotted decimal'''
 
-        regexp = re.compile('[' + string.hexdigits + ']{8}' )
-        for f in os.listdir(path):
+        regexp = re.compile('[' + string.hexdigits + ']+$' )
+        files = os.listdir(path)
+        files.sort()
+        for f in files:
+
+                hostname = hostname_resolve = False
+
                 fullpath = os.path.join(path, f)
                 if os.path.islink(fullpath):
@@ -47 +52 @@
                 else:
                         symlink_dest = None
+                
+                if regexp.match(f) and symlink_dest:
+                        size = len(f)
+                        digit2 = digit3 = digit4 = 'X'
 
-                if regexp.match(f) and len(f) == 8:
-                        digit1 = string.atoi(f[:2], 16)
-                        digit2 = string.atoi(f[2:4], 16)
-                        digit3 = string.atoi(f[4:6], 16)
-                        digit4 = string.atoi(f[6:], 16)
+                        if size >= 2:
+                                digit1 = str(string.atoi(f[:2], 16))
+                        if size >= 4:
+                                digit2 = str(string.atoi(f[2:4], 16))
+                        if size >= 6:
+                                digit3 = str(string.atoi(f[4:6], 16))
+                        if size >= 8:
+                                hostname_resolve = True
+                                digit4 = str(string.atoi(f[6:], 16))
 
-                        ipaddr = '%d.%d.%d.%d' % (digit1, digit2, digit3, digit4) 
-                        try:
-                                hostname = socket.gethostbyaddr(ipaddr)
-                        except socket.herror, detail:
-                                hostname = ( detail[1], 'dummy' )
+                        ipaddr = '%s.%s.%s.%s' % (digit1, digit2, digit3, digit4) 
+
+                        if hostname_resolve:
+                                try:
+                                        hostname = socket.gethostbyaddr(ipaddr)
+                                except socket.herror, detail:
+                                        hostname = ( detail[1], 'dummy' )
 
                         if hostname:
@@ -65 +80 @@
                                 output = '%s => %s' % (f, ipaddr)
 
-                        if symlink_dest:
-                                output = '%s -> %s' % (output, symlink_dest)
+                        output = '%s -> %s' % (output, symlink_dest)
 
                         print output

trunk/pxeconfig.in

@@ -77 +77 @@
 START='start'
 END='end'
-VERSION='0.7.1'
 REMOVE='remove'
 INTERACTIVE='interactive'
+VERSION=0.7.1
 
 SHORTOPT_LIST='hVn:s:e:f:ri'

trunk/pxeconfigd.in

@@ -60 +60 @@
 
 PXE_CONF_DIR = '/tftpboot/pxelinux.cfg'
-VERSION = '0.4.4'
+VERSION = '0.7.1'
 
 # Give the current time