From 8aeec91212268ecc53e47f6d242b07e5a8300bdd Mon Sep 17 00:00:00 2001 From: cohen Date: Sat, 7 Oct 2006 03:51:53 +0200 Subject: [PATCH] correction boulette (prise 50 != uplink) darcs-hash:20061007015153-f6463-812acd54f8af202d80669a560183bd654896592f.gz --- gestion/tools/locate-mac.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gestion/tools/locate-mac.py b/gestion/tools/locate-mac.py index be2e0601..c066a836 100755 --- a/gestion/tools/locate-mac.py +++ b/gestion/tools/locate-mac.py @@ -30,8 +30,10 @@ class interroge_switch (threading.Thread) : while (prise==None) & (iteration > 0): prise = sw.where_is_mac(self.mac) iteration = iteration-1 - if (prise != None) & (prise != 50) : # si port 50 (uplink, on affiche rien) - self.reponse = ("%-10s => prise %-2s : %s" % (self.switch.encode('iso-8859-15').replace('.adm.crans.org',''), str(prise), sw.nom(None, prise))) + if (prise != None): # si port 50 (uplink, on affiche rien) + nom=sw.nom(None,prise) + if nom.find("uplink")==-1: + self.reponse = ("%-10s => prise %-2s : %s" % (self.switch.encode('iso-8859-15').replace('.adm.crans.org',''), str(prise), nom)) # interrogation des switchs en parallele def get_trace(mac):