# HG changeset patch # User Aurelien Campeas # Date 1253118313 -7200 # Node ID ae43a0ddc1d9a24a74655241189a6fbc2c208017 # Parent 02a918f108a7056d2fdd81c278b089051477fdd1 warning -> critical, also allow goa to work without vobject diff -r 02a918f108a7 -r ae43a0ddc1d9 cwconfig.py --- a/cwconfig.py Wed Sep 16 18:14:43 2009 +0200 +++ b/cwconfig.py Wed Sep 16 18:25:13 2009 +0200 @@ -395,7 +395,7 @@ try: load_module_from_file(join(CW_SOFTWARE_ROOT, ctlfile)) except ImportError, err: - cls.warning('could not import the command provider %s (cause : %s)' % + cls.critical('could not import the command provider %s (cause : %s)' % (ctlfile, err)) cls.info('loaded cubicweb-ctl plugin %s', ctlfile) for cube in cls.available_cubes(): diff -r 02a918f108a7 -r ae43a0ddc1d9 goa/goactl.py --- a/goa/goactl.py Wed Sep 16 18:14:43 2009 +0200 +++ b/goa/goactl.py Wed Sep 16 18:25:13 2009 +0200 @@ -8,7 +8,6 @@ __docformat__ = "restructuredtext en" from os.path import exists, join, split, basename, normpath, abspath - from logilab.common.clcommands import register_commands from cubicweb import CW_SOFTWARE_ROOT, BadCommandUsage @@ -19,9 +18,9 @@ from logilab import common as lgc from logilab import constraint as lgcstr from logilab import mtconverter as lgmtc -import rql, yams, yapps, simplejson, dateutil, vobject, docutils, roman +import rql, yams, yapps, simplejson, docutils, roman, voject -SLINK_DIRECTORIES = ( +SLINK_DIRECTORIES = [ (lgc.__path__[0], 'logilab/common'), (lgmtc.__path__[0], 'logilab/mtconverter'), (lgcstr.__path__[0], 'logilab/constraint'), @@ -29,8 +28,6 @@ (simplejson.__path__[0], 'simplejson'), (yams.__path__[0], 'yams'), (yapps.__path__[0], 'yapps'), - (dateutil.__path__[0], 'dateutil'), - (vobject.__path__[0], 'vobject'), (docutils.__path__[0], 'docutils'), (roman.__file__.replace('.pyc', '.py'), 'roman.py'), @@ -42,7 +39,15 @@ (join(CW_SOFTWARE_ROOT, 'i18n'), join('cubes', 'shared', 'i18n')), (join(CW_SOFTWARE_ROOT, 'goa', 'tools'), 'tools'), (join(CW_SOFTWARE_ROOT, 'goa', 'bin'), 'bin'), - ) + ] + +try: + import dateutil + import vobject + SLINK_DIRECTORIES.extend([ (dateutil.__path__[0], 'dateutil'), + (vobject.__path__[0], 'vobject') ] ) +except ImportError: + pass COPY_CW_FILES = ( '__init__.py',