equal
deleted
inserted
replaced
25 |
25 |
26 import logilab.common.configuration as lgconfig |
26 import logilab.common.configuration as lgconfig |
27 from logilab.common.decorators import wproperty, cached |
27 from logilab.common.decorators import wproperty, cached |
28 |
28 |
29 from cubicweb.toolsutils import read_config, restrict_perms_to_user |
29 from cubicweb.toolsutils import read_config, restrict_perms_to_user |
30 from cubicweb.cwconfig import CubicWebConfiguration, merge_options |
30 from cubicweb.cwconfig import CONFIGURATIONS, CubicWebConfiguration, merge_options |
31 from cubicweb.server import SOURCE_TYPES |
31 from cubicweb.server import SOURCE_TYPES |
32 |
32 |
33 |
33 |
34 USER_OPTIONS = ( |
34 USER_OPTIONS = ( |
35 ('login', {'type' : 'string', |
35 ('login', {'type' : 'string', |
344 if verbosity is None: |
344 if verbosity is None: |
345 verbosity = getattr(self, 'verbosity', 0) |
345 verbosity = getattr(self, 'verbosity', 0) |
346 return ServerMigrationHelper(self, schema, interactive=interactive, |
346 return ServerMigrationHelper(self, schema, interactive=interactive, |
347 cnx=cnx, repo=repo, connect=connect, |
347 cnx=cnx, repo=repo, connect=connect, |
348 verbosity=verbosity) |
348 verbosity=verbosity) |
|
349 |
|
350 |
|
351 CONFIGURATIONS.append(ServerConfiguration) |