[udev_update_symlinks] Correction pour tenir compte des aléas de file

This commit is contained in:
Pierre-Elliott Bécue 2013-04-24 12:02:55 +02:00
parent a9b7d12314
commit 89c4007c97

View file

@ -41,7 +41,7 @@ def make_link(couple):
sym, dev = couple sym, dev = couple
diskstatus = subprocess.Popen(['file', '-sb', '/dev/' + dev], stdout=subprocess.PIPE) diskstatus = subprocess.Popen(['file', '-sb', '/dev/' + dev], stdout=subprocess.PIPE)
diskstatus = diskstatus.stdout.readlines()[0] diskstatus = diskstatus.stdout.readlines()[0]
if not os.path.islink(sym) and diskstatus != 'empty\n': if not os.path.islink(sym) and 'empty' in diskstatus:
sys.stdout.write("Création du lien /dev/" + sym + " -> /dev/" + dev + "") sys.stdout.write("Création du lien /dev/" + sym + " -> /dev/" + dev + "")
try: try:
os.symlink(dev, sym) os.symlink(dev, sym)
@ -51,7 +51,7 @@ def make_link(couple):
sys.stdout.write(coul("ECHEC", 'rouge')) sys.stdout.write(coul("ECHEC", 'rouge'))
res = False res = False
sys.stdout.write('\n') sys.stdout.write('\n')
elif os.path.islink(sym) and diskstatus == 'empty\n': elif os.path.islink(sym) and 'empty' in diskstatus:
sys.stdout.write("Destruction du lien /dev/" + sym + "") sys.stdout.write("Destruction du lien /dev/" + sym + "")
try: try:
os.remove(sym) os.remove(sym)