diff options
author | Keir Fraser <keir@xensource.com> | 2007-06-15 10:01:32 +0100 |
---|---|---|
committer | Keir Fraser <keir@xensource.com> | 2007-06-15 10:01:32 +0100 |
commit | b19760e24457365fd279a0fabdfee6b0337350d6 (patch) | |
tree | f9e1d8854179bdbd88f4fdeaf55d49e16cef9000 /tools | |
parent | dd8e0a08e0823f193744290ebe1c16fe19642c91 (diff) | |
download | xen-b19760e24457365fd279a0fabdfee6b0337350d6.tar.gz xen-b19760e24457365fd279a0fabdfee6b0337350d6.tar.bz2 xen-b19760e24457365fd279a0fabdfee6b0337350d6.zip |
xend: Replace tabs with 8 whitespaces in DevController.py
Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/xen/xend/server/DevController.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py index faba7bf400..6984435385 100644 --- a/tools/python/xen/xend/server/DevController.py +++ b/tools/python/xen/xend/server/DevController.py @@ -213,7 +213,7 @@ class DevController: devid = int(devid) frontpath = self.frontendPath(devid) - if frontpath: + if frontpath: backpath = xstransact.Read(frontpath, "backend") # Modify online status /before/ updating state (latter is watched by @@ -224,22 +224,22 @@ class DevController: if force: if backpath: xstransact.Remove(backpath) - if frontpath: + if frontpath: xstransact.Remove(frontpath) - return - - # Wait till both frontpath and backpath are removed from - # xenstore, or timed out - if frontpath: - status = self.waitUntilDestroyed(frontpath) - if status == Timeout: - # Exception will be caught by destroyDevice in XendDomainInfo.py - raise EnvironmentError - if backpath: - status = self.waitUntilDestroyed(backpath) - if status == Timeout: - # Exception will be caught by destroyDevice in XendDomainInfo.py - raise EnvironmentError + return + + # Wait till both frontpath and backpath are removed from + # xenstore, or timed out + if frontpath: + status = self.waitUntilDestroyed(frontpath) + if status == Timeout: + # Exception will be caught by destroyDevice in XendDomainInfo.py + raise EnvironmentError + if backpath: + status = self.waitUntilDestroyed(backpath) + if status == Timeout: + # Exception will be caught by destroyDevice in XendDomainInfo.py + raise EnvironmentError self.vm._removeVm("device/%s/%d" % (self.deviceClass, devid)) |