1.1 --- a/tools/python/xen/xend/server/DevController.py	Fri Jun 15 09:42:39 2007 +0100
     1.2 +++ b/tools/python/xen/xend/server/DevController.py	Fri Jun 15 10:01:32 2007 +0100
     1.3 @@ -213,7 +213,7 @@ class DevController:
     1.4          devid = int(devid)
     1.5  
     1.6          frontpath = self.frontendPath(devid)
     1.7 -	if frontpath:
     1.8 +        if frontpath:
     1.9              backpath = xstransact.Read(frontpath, "backend")
    1.10  
    1.11          # Modify online status /before/ updating state (latter is watched by
    1.12 @@ -224,22 +224,22 @@ class DevController:
    1.13          if force:
    1.14              if backpath:
    1.15                  xstransact.Remove(backpath)
    1.16 -	    if frontpath:
    1.17 +            if frontpath:
    1.18                  xstransact.Remove(frontpath)
    1.19 -	    return
    1.20 +            return
    1.21  
    1.22 -	# Wait till both frontpath and backpath are removed from
    1.23 -	# xenstore, or timed out
    1.24 -	if frontpath:
    1.25 -	    status = self.waitUntilDestroyed(frontpath)
    1.26 -	    if status == Timeout:
    1.27 -	        # Exception will be caught by destroyDevice in XendDomainInfo.py
    1.28 -	        raise EnvironmentError
    1.29 -	if backpath:
    1.30 -	    status = self.waitUntilDestroyed(backpath)
    1.31 -	    if status == Timeout:
    1.32 -	        # Exception will be caught by destroyDevice in XendDomainInfo.py
    1.33 -	        raise EnvironmentError
    1.34 +        # Wait till both frontpath and backpath are removed from
    1.35 +        # xenstore, or timed out
    1.36 +        if frontpath:
    1.37 +            status = self.waitUntilDestroyed(frontpath)
    1.38 +            if status == Timeout:
    1.39 +                # Exception will be caught by destroyDevice in XendDomainInfo.py
    1.40 +                raise EnvironmentError
    1.41 +        if backpath:
    1.42 +            status = self.waitUntilDestroyed(backpath)
    1.43 +            if status == Timeout:
    1.44 +                # Exception will be caught by destroyDevice in XendDomainInfo.py
    1.45 +                raise EnvironmentError
    1.46  
    1.47          self.vm._removeVm("device/%s/%d" % (self.deviceClass, devid))
    1.48