[Erp5-report] r39232 luke - /erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recip...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 15 15:36:07 CEST 2010
Author: luke
Date: Fri Oct 15 15:36:05 2010
New Revision: 39232
URL: http://svn.erp5.org?rev=39232&view=rev
Log:
- switch to subprocess module to catch executed command output easier
- raise informative zc.buildout.UserError
Modified:
erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py
Modified: erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py?rev=39232&r1=39231&r2=39232&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] Fri Oct 15 15:36:05 2010
@@ -17,6 +17,7 @@ import os, sys, subprocess, socket
from string import Template
import zc.buildout
import plone.recipe.zope2instance
+import subprocess
class WithMinusTemplate(Template):
idpattern = '[_a-z][-_a-z0-9]*'
@@ -212,8 +213,13 @@ class Recipe(plone.recipe.zope2instance.
os.path.join(options['bt5-path'])])
argv.extend([bt for bt in options.get('bt5', '').split('\n') if bt])
- assert os.spawnl(
- os.P_WAIT, zopectl_path, *argv ) == 0
+ popen = subprocess.Popen(argv, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT)
+ result = popen.communicate()[0]
+ if popen.returncode is None or popen.returncode != 0:
+ raise zc.buildout.UserError("""Issues during initalising ERP5 Site.
+Used command: %(command)r
+Message: %(result)s""" % dict(command=argv, result=result))
def build_zope_conf(self):
options = self.options
More information about the Erp5-report
mailing list