From dbeeacc33b7e25fb3bbf1e8fa49da7937f62fe8f Mon Sep 17 00:00:00 2001 From: mehlinger333 Date: Thu, 24 Sep 2015 15:32:40 +0100 Subject: Bug 464528: Project names having dashes in them do not work. r=gerv. --- Bugzilla/Constants.pm | 2 +- docs/en/rst/installing/multiple-bugzillas.rst | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index ec2b03c05..ff0eeb8e7 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -682,7 +682,7 @@ sub _bz_locations { $libpath = $1; my ($localconfig, $datadir); - if ($project && $project =~ /^(\w+)$/) { + if ($project && $project =~ /^([\w-]+)$/) { $project = $1; $localconfig = "localconfig.$project"; $datadir = "data/$project"; diff --git a/docs/en/rst/installing/multiple-bugzillas.rst b/docs/en/rst/installing/multiple-bugzillas.rst index 1e2d7951f..ac6626823 100644 --- a/docs/en/rst/installing/multiple-bugzillas.rst +++ b/docs/en/rst/installing/multiple-bugzillas.rst @@ -19,7 +19,8 @@ this is :file:`template/en/default` so ``PROJECT``'s templates would be located at :file:`template/en/PROJECT`. To set up an alternate installation, just export ``PROJECT=foo`` before -running :command:`checksetup.pl` for the first time. It will +running :command:`checksetup.pl` for the first time. Project names may +contain only letters, numbers, underscores, and hyphens. It will result in a file called :file:`localconfig.foo` instead of :file:`localconfig`. Edit this file as described above, with reference to a new database, and re-run :command:`checksetup.pl` -- cgit v1.2.3-24-g4f1b