From 3b7af7e35bc963ccbb770fdcc3195c64335dbd94 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Tue, 16 Nov 2010 12:39:32 -0800 Subject: [PATCH] bug 7191: can't use macro errno.EEXIST here, use 17 instead status 7191: resolved fixed --- scripts/vm/hypervisor/xenserver/vmops | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index a4c3bd2ae11..df7453e81d7 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -712,9 +712,9 @@ def makedirs(path): try: os.makedirs(path) except OSError, (errno, strerror): - if errno == errno.EEXIST: + if errno == 17: try: - cmd = ['umount', path ] + cmd = ['umount', '-f', path ] util.pread2(cmd) except CommandException: errMsg = "CommandException raised while trying to umount " + path @@ -732,7 +732,7 @@ def mount(remoteDir, localDir): makedirs(localDir) try: - options = "soft,timeo=133,retrans=10,tcp,noac" + options = "soft,timeo=133,retrans=3,tcp,noac" cmd = ['mount', remoteDir, localDir, "-o", options] txt = util.pread2(cmd) except: @@ -746,7 +746,7 @@ def mount(remoteDir, localDir): def umount(localDir): try: - cmd = ['umount', localDir] + cmd = ['umount', '-f', localDir] util.pread2(cmd) except CommandException: errMsg = "CommandException raised while trying to umount " + localDir