Switch to unified view

a/Allura/allura/command/base.py b/Allura/allura/command/base.py
...
...
7
import pylons
7
import pylons
8
from paste.script import command
8
from paste.script import command
9
from paste.deploy import appconfig
9
from paste.deploy import appconfig
10
from paste.registry import Registry
10
from paste.registry import Registry
11
11
12
import activitystream
12
import ming
13
import ming
13
from allura.config.environment import load_environment
14
from allura.config.environment import load_environment
14
15
15
log = None
16
log = None
16
17
...
...
54
            load_environment(conf.global_conf, conf.local_conf)
55
            load_environment(conf.global_conf, conf.local_conf)
55
            self.setup_globals()
56
            self.setup_globals()
56
            from allura import model
57
            from allura import model
57
            M=model
58
            M=model
58
            ming.configure(**conf)
59
            ming.configure(**conf)
60
            activitystream.configure(**conf)
59
            pylons.c.user = M.User.anonymous()
61
            pylons.c.user = M.User.anonymous()
60
        else:
62
        else:
61
            # Probably being called from another script (websetup, perhaps?)
63
            # Probably being called from another script (websetup, perhaps?)
62
            log = logging.getLogger('allura.command')
64
            log = logging.getLogger('allura.command')
63
            conf = pylons.config
65
            conf = pylons.config