Tweaked the settings a bit, to avoid problems if changing TRAC_WIKI_DIR_ROOT after TRAC_WIKI_DIR_PATTERN has been set. Added a --wiki-dir-pattern switch to the management command.

 - Legacy-Id: 12181

Author: levkowetz

ietf/settings.py

@@ -382,7 +382,7 @@ def skip_unreadable_post(record):
     r"^\^admin/",
 ]
 
-# Tese are filename globs
+# These are filename globs.  They are fed directly to the coverage code checker.
 TEST_CODE_COVERAGE_EXCLUDE = [
     "*/tests*",
     "*/admin.py",
@@ -660,8 +660,7 @@ def skip_unreadable_post(record):
 }
 
 TRAC_MASTER_DIR = "/a/www/trac-setup/"
-TRAC_WIKI_DIR_ROOT = "/a/www/www6s/trac/"
-TRAC_WIKI_DIR_PATTERN = os.path.join(TRAC_WIKI_DIR_ROOT, "%s")
+TRAC_WIKI_DIR_PATTERN = "/a/www/www6s/trac/%s"
 TRAC_WIKI_URL_PATTERN = "https://trac.ietf.org/trac/%s/wiki"
 TRAC_ISSUE_URL_PATTERN = "https://trac.ietf.org/trac/%s/report/1"
 TRAC_SVN_DIR_PATTERN = "/a/svn/group/%s"

ietf/utils/management/commands/create_group_wikis.py

@@ -4,16 +4,14 @@
 import copy
 import syslog
 import pkg_resources
+from optparse import make_option
 #from optparse import make_option
 
-from trac.admin.api import AdminCommandManager
 from trac.core import TracError
 from trac.env import Environment
 from trac.perm import PermissionSystem
 from trac.ticket.model import Component, Milestone, Severity
 from trac.util.text import unicode_unquote
-from trac.versioncontrol.api import RepositoryManager
-from trac.wiki.admin import WikiAdmin
 from trac.wiki.model import WikiPage
 
 from django.conf import settings
@@ -33,8 +31,8 @@ class Command(BaseCommand):
     help = "Create group wikis for WGs, RGs and Areas which don't have one."
 
     option_list = BaseCommand.option_list + (
+        make_option('--wiki-dir-pattern', dest='wiki_dir_pattern', help='File containing email (default: stdin)'),
     )    
-    #verbosity = 1
 
     def note(self, msg):
         if self.verbosity > 1:
@@ -238,12 +236,13 @@ def add_custom_group_states(self, group, env):
     def handle(self, *filenames, **options):
         self.verbosity = options['verbosity']
         self.errors = 0
+        self.wiki_dir_pattern = options.get('wiki_dir_pattern', settings.TRAC_WIKI_DIR_PATTERN)
 
-        if self.verbosity.isdigit():
+        if isinstance(self.verbosity, (type(""), type(u""))) and self.verbosity.isdigit():
             self.verbosity = int(self.verbosity)
 
-        if not os.path.exists(settings.TRAC_WIKI_DIR_ROOT):
-            raise CommandError('The Wiki base direcory specified in settings.TRAC_WIKI_DIR_ROOT (%s) does not exist.' % settings.TRAC_WIKI_DIR_ROOT)
+        if not os.path.exists(os.path.dirname(self.wiki_dir_pattern)):
+            raise CommandError('The Wiki base direcory specified for the wiki directories (%s) does not exist.' % os.path.dirname(self.wiki_dir_pattern))
 
         groups = Group.objects.filter(
                         type__slug__in=['wg','rg','area'],
@@ -253,7 +252,7 @@ def handle(self, *filenames, **options):
         for group in groups:
             try:
                 self.note("Processing group %s" % group.acronym)
-                group.trac_dir = settings.TRAC_WIKI_DIR_PATTERN % group.acronym
+                group.trac_dir = self.wiki_dir_pattern % group.acronym
                 group.svn_dir = settings.TRAC_SVN_DIR_PATTERN % group.acronym
 
                 if not os.path.exists(group.svn_dir):