X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/22d87516a1a525bc6cb12db96077569b79f5eda5..9e3f506f0d0e1b0c09d1e9d7051af23bfede7834:/stgit/main.py diff --git a/stgit/main.py b/stgit/main.py index 60df5ef..c2af585 100644 --- a/stgit/main.py +++ b/stgit/main.py @@ -220,12 +220,16 @@ def main(): # These modules are only used from this point onwards and do not # need to be imported earlier + from stgit.config import config_setup + from ConfigParser import ParsingError, NoSectionError from stgit.stack import Series, StackException from stgit.git import GitException from stgit.commands.common import CmdException from stgit.gitmergeonefile import GitMergeException try: + config_setup() + # 'clone' doesn't expect an already initialised GIT tree. A Series # object will be created after the GIT tree is cloned if cmd != 'clone': @@ -236,8 +240,8 @@ def main(): stgit.commands.common.crt_series = command.crt_series command.func(parser, options, args) - except (IOError, CmdException, StackException, GitException, - GitMergeException), err: + except (IOError, ParsingError, NoSectionError, CmdException, + StackException, GitException, GitMergeException), err: print >> sys.stderr, '%s %s: %s' % (prog, cmd, err) sys.exit(2) except KeyboardInterrupt: