Bug 392573 â\80\93 Most CSS files are missing from Dusk/, flooding web server error logs.

Patch by Marc Schumann <wurblzap@gmail.com>;
r=LpSolit; a=LpSolit

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index d5b8a58c45158e2c9dd51c7f7c186b965213e7f0..31944bc59862f25b99ed16f698001a95ed977d36 100644 (file)
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -34,6 +34,7 @@ use Bugzilla::Util;
 
 use File::Find;
 use File::Path;
+use File::Basename;
 use IO::File;
 use POSIX ();
 
@@ -200,17 +201,22 @@ sub FILESYSTEM {
     );
 
     # Each standard stylesheet has an associated custom stylesheet that
-    # we create.
-    foreach my $standard (<$skinsdir/standard/*.css>) {
-        my $custom = $standard;
-        $custom =~ s|\Q$skinsdir\E/standard|$skinsdir/custom|;
-        $create_files{$custom} = { perms => $ws_readable, contents => <<EOT
+    # we create. Also, we create placeholders for standard stylesheets
+    # for contrib skins which don't provide them themselves.
+    foreach my $skin_dir ("$skinsdir/custom", <$skinsdir/contrib/*>) {
+        next unless -d $skin_dir;
+        next if basename($skin_dir) =~ /^cvs$/i;
+        foreach (<$skinsdir/standard/*.css>) {
+            my $standard_css_file = basename($_);
+            my $custom_css_file = "$skin_dir/$standard_css_file";
+            $create_files{$custom_css_file} = { perms => $ws_readable, contents => <<EOT
 /*
- * Custom rules for $standard.
+ * Custom rules for $standard_css_file.
  * The rules you put here override rules in that stylesheet.
  */
 EOT
-        };
+            }
+        }
     }
 
     # Because checksetup controls the creation of index.html separately