From 89c4007c97c3c767c4673303d07738abe1439c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Wed, 24 Apr 2013 12:02:55 +0200 Subject: [PATCH] =?UTF-8?q?[udev=5Fupdate=5Fsymlinks]=20Correction=20pour?= =?UTF-8?q?=20tenir=20compte=20des=20al=C3=A9as=20de=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/iscsi/udev_update_symlinks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gestion/iscsi/udev_update_symlinks.py b/gestion/iscsi/udev_update_symlinks.py index dd375135..2167882c 100644 --- a/gestion/iscsi/udev_update_symlinks.py +++ b/gestion/iscsi/udev_update_symlinks.py @@ -41,7 +41,7 @@ def make_link(couple): sym, dev = couple diskstatus = subprocess.Popen(['file', '-sb', '/dev/' + dev], stdout=subprocess.PIPE) 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 + " … ") try: os.symlink(dev, sym) @@ -51,7 +51,7 @@ def make_link(couple): sys.stdout.write(coul("ECHEC", 'rouge')) res = False 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 + " … ") try: os.remove(sym)