Bug 464528: Project names having dashes in them do not work. r=gerv.

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index ec2b03c05ec43dd363ab3a59ed0168720084074c..ff0eeb8e7b02aac0c050f692baa1573d0e003174 100644 (file)
--- 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 1e2d7951fade2c221f5f4a1eb0d48cc15bdffde5..ac66268236fb6b4c556f65fb77bc9dd3d7e51ca6 100644 (file)
--- 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`