On donne un peu plus d'informations pour le dbogage.
darcs-hash:20060409044220-68412-b597fd9a7f6c5d5731e36dfc2c0766db7baa151a.gz
This commit is contained in:
parent
64333251cf
commit
b53c7336fe
1 changed files with 14 additions and 4 deletions
|
@ -6,18 +6,28 @@
|
||||||
# Licence : GPLv2
|
# Licence : GPLv2
|
||||||
|
|
||||||
import sys, os, sre, smtplib
|
import sys, os, sre, smtplib
|
||||||
|
from commands import getstatusoutput
|
||||||
|
|
||||||
find_mac = sre.compile(r'[0-9A-Fa-f]{1,2}(?::[0-9A-Fa-f]{1,2}){5}')
|
find_mac = sre.compile(r'[0-9A-Fa-f]{1,2}(?::[0-9A-Fa-f]{1,2}){5}')
|
||||||
|
|
||||||
def get_machine(mac):
|
def get_machine(mac):
|
||||||
s = os.popen("/usr/scripts/gestion/whos.py --debug mac=%s" % mac).readlines()
|
commande = "/usr/scripts/gestion/whos.py --debug mac=%s" % mac
|
||||||
if len(s) == 1:
|
r, s = getstatusoutput(commande)
|
||||||
# En général, c'est la ligne "Aucun résultat trouvé"
|
if r == 3:
|
||||||
|
# Aucun résultat trouvé
|
||||||
return ""
|
return ""
|
||||||
else:
|
else:
|
||||||
# On supprime les couleurs
|
# On supprime les couleurs
|
||||||
s = "\n" + "".join(s)
|
|
||||||
s = sre.sub('\x1b\[1;([0-9]|[0-9][0-9])m', '', s)
|
s = sre.sub('\x1b\[1;([0-9]|[0-9][0-9])m', '', s)
|
||||||
|
# On rajoute éventuellement le code de retour
|
||||||
|
if r != 0:
|
||||||
|
s = """
|
||||||
|
Code de retour anormal : %d
|
||||||
|
Commande : %s
|
||||||
|
%s
|
||||||
|
""" % (r, commande, s)
|
||||||
|
else:
|
||||||
|
s = "\n" + s + "\n"
|
||||||
return s
|
return s
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue