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):