← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to serve-branches

  • Committer: Michael Hudson
  • Date: 2009-04-23 23:37:10 UTC
  • mfrom: (327.1.1 one-config)
  • Revision ID: michael.hudson@canonical.com-20090423233710-9ollsj79xebarsxw
merge Matt's one-config branch, which starts to use a single object for configuration

Show diffs side-by-side

added added

removed removed

Lines of Context:
serve-branches
66
66
        if not config.get_option('trunk_dir'):
67
67
            print "You didn't specify a directory for the trunk directories."
68
68
            sys.exit(1)
69
 
        app = UserBranchesFromFileSystemRoot(
70
 
            path, config.get_option('trunk_dir'))
 
69
        app = UserBranchesFromFileSystemRoot(path, config)
71
70
    else:
72
 
        app = BranchesFromFileSystemRoot(path)
 
71
        app = BranchesFromFileSystemRoot(path, config)
73
72
 
74
73
    # setup_logging()
75
74
    logging.basicConfig()