summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormehlinger333 <mehlinger333@gmail.com>2015-09-24 16:32:40 +0200
committerGervase Markham <gerv@gerv.net>2015-09-24 16:32:40 +0200
commitdbeeacc33b7e25fb3bbf1e8fa49da7937f62fe8f (patch)
treeb8b652a431a6583821cf178d147aea23d1905031
parent05f74faf6a98ef8d2ac5d38007e093e6fa1bb1fc (diff)
downloadbugzilla-dbeeacc33b7e25fb3bbf1e8fa49da7937f62fe8f.tar.gz
bugzilla-dbeeacc33b7e25fb3bbf1e8fa49da7937f62fe8f.tar.xz
Bug 464528: Project names having dashes in them do not work. r=gerv.
-rw-r--r--Bugzilla/Constants.pm2
-rw-r--r--docs/en/rst/installing/multiple-bugzillas.rst3
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`