[Erp5-report] r45382 luke - /slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 13 15:20:26 CEST 2011
Author: luke
Date: Wed Apr 13 15:20:25 2011
New Revision: 45382
URL: http://svn.erp5.org?rev=45382&view=rev
Log:
- break another import loop
Added:
slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/exception.py
Modified:
slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/SlapObject.py
slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/utils.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=45382&r1=45381&r2=45382&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:20:25 2011
@@ -37,6 +37,8 @@ from utils import launchBuildout, getCle
dropPrivileges, bootstrapBuildout, updateFile,\
getSoftwareUrlHash, SlapPopen
from svcbackend import getSupervisorRPC
+from exception import BuildoutFailedError, WrongPermissionError, \
+ PathDoesNotExistError
REQUIRED_COMPUTER_PARTITION_PERMISSION = '0750'
@@ -402,17 +404,3 @@ class Partition(object):
self.logger.info('Updated %r' % gname)
self.logger.debug('Supervisord updated')
-"""Exposed exceptions"""
-
-
-class PathDoesNotExistError(Exception):
- pass
-
-
-class WrongPermissionError(Exception):
- pass
-
-
-class BuildoutFailedError(Exception):
- pass
-
Added: slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/exception.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/exception.py?rev=45382&view=auto
==============================================================================
--- slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/exception.py (added)
+++ slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/exception.py [utf8] Wed Apr 13 15:20:25 2011
@@ -0,0 +1,39 @@
+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+"""Exposed exceptions"""
+
+
+class PathDoesNotExistError(Exception):
+ pass
+
+
+class WrongPermissionError(Exception):
+ pass
+
+
+class BuildoutFailedError(Exception):
+ pass
Modified: slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/utils.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/utils.py?rev=45382&r1=45381&r2=45382&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/utils.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.grid/src/slapos/tool/grid/utils.py [utf8] Wed Apr 13 15:20:25 2011
@@ -33,7 +33,7 @@ import subprocess
import sys
import pwd
import grp
-from SlapObject import BuildoutFailedError, WrongPermissionError
+from exception import BuildoutFailedError, WrongPermissionError
from hashlib import md5
# Such umask by default will create paths with full permission
More information about the Erp5-report
mailing list