[Erp5-report] r45381 luke - /slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/

[nobody at svn.erp5.org]

Author: luke
Date: Wed Apr 13 15:17:35 2011
New Revision: 45381

URL: http://svn.erp5.org?rev=45381&view=rev
Log:
 - import nothing from slapgrid

Modified:
    slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/SlapObject.py

Modified: slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/SlapObject.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/SlapObject.py?rev=45381&r1=45380&r2=45381&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/SlapObject.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/SlapObject.py [utf8] Wed Apr 13 15:17:35 2011
@@ -32,7 +32,6 @@ import pkg_resources
 import stat
 from supervisor import xmlrpc
 import xmlrpclib
-import slapgrid
 import pwd
 from utils import launchBuildout, getCleanEnvironment,\
                    dropPrivileges, bootstrapBuildout, updateFile,\
@@ -162,11 +161,11 @@ class Partition(object):
     # Checks existence and permissions of Partition directory
     # Note : Partitions have to be created and configured before running slapgrid
     if not os.path.isdir(self.instance_path):
-      raise slapgrid.PathDoesNotExistError('Please create partition directory %s'
+      raise PathDoesNotExistError('Please create partition directory %s'
                                            % self.instance_path)
     permission = oct(stat.S_IMODE(os.stat(self.instance_path).st_mode))
     if permission != REQUIRED_COMPUTER_PARTITION_PERMISSION:
-      raise slapgrid.WrongPermissionError('Wrong permissions in %s : actual ' \
+      raise WrongPermissionError('Wrong permissions in %s : actual ' \
                                           'permissions are : %s, wanted ' \
                                           'are %s' %
                                           (self.instance_path, permission,
@@ -235,7 +234,7 @@ class Partition(object):
       if process_handler.returncode is None or process_handler.returncode != 0:
         message = 'Failed to bootstrap buildout in %r:\n%s\n' % (
             self.instance_path, result_std)
-        raise slapgrid.BuildoutFailedError(message)
+        raise BuildoutFailedError(message)
       buildout_binary = os.path.join(self.instance_path, 'sbin', 'buildout')
 
     if not os.path.exists(buildout_binary):