[wikis/.../Hoststatus.py] Un nom de machine peut contenir des . ou des -

darcs-hash:20081209013510-bd074-4824a38aae3caeca3d32b06248c0e6d260f1266d.gz
This commit is contained in:
Antoine Durand-Gasselin 2008-12-09 02:35:10 +01:00
parent ec1dc3e96a
commit 03377202ab
2 changed files with 2 additions and 2 deletions

View file

@ -22,7 +22,7 @@ def execute(macro, text) :
line = lines[0].split(' ')
trucsdown += f.table_row(1)
trucsdown += f.table_cell(1,{'style':'background-color:lightgrey;'})
trucsdown += unicode(f.text('%s (%s)' % (line [0], getoutput("grep '^%s[^a-zA-Z]' /usr/scripts/var/autostatus/hosts | cut -d ' ' -f 5-" % line [0])) ), "iso-8859-15")
trucsdown += unicode(f.text('%s (%s)' % (line [0], getoutput("grep '^%s[^-.a-zA-Z]' /usr/scripts/var/autostatus/hosts | cut -d ' ' -f 5-" % line [0])) ), "iso-8859-15")
trucsdown += f.table_cell(0)
# nombre de non réponse au ping
if int(line[1]) > 2 :

View file

@ -21,7 +21,7 @@ def execute(macro, text) :
line = lines[0].split(' ')
trucsdown += f.table_row(1)
trucsdown += f.table_cell(1,{'style':'background-color:lightgrey;'})
trucsdown += unicode(f.text('%s (%s)' % (line [0], getoutput("grep '^%s[^a-zA-Z]' /usr/scripts/var/autostatus/hosts | cut -d ' ' -f 5-" % line [0])) ), "iso-8859-15")
trucsdown += unicode(f.text('%s (%s)' % (line [0], getoutput("grep '^%s[^-a-zA-Z.]' /usr/scripts/var/autostatus/hosts | cut -d ' ' -f 5-" % line [0])) ), "iso-8859-15")
trucsdown += f.table_cell(0)
# nombre de non réponse au ping
if int(line[1]) > 2 :