summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormyk%mozilla.org <>2005-04-09 17:11:32 +0200
committermyk%mozilla.org <>2005-04-09 17:11:32 +0200
commit9b0870a642dfbfc833bc1e95884fc0db2bb88529 (patch)
tree6bebac18ce54b1dd4566b7d4dfd2a627a75f28e4
parent61898d18479013cfbcc820ff25f39377db071536 (diff)
downloadbugzilla-9b0870a642dfbfc833bc1e95884fc0db2bb88529.tar.gz
bugzilla-9b0870a642dfbfc833bc1e95884fc0db2bb88529.tar.xz
Fix for bug 273209: makes CVS ignore skins/.cvsignore; r=jouni; a=myk
-rwxr-xr-xchecksetup.pl25
1 files changed, 2 insertions, 23 deletions
diff --git a/checksetup.pl b/checksetup.pl
index ce9278f05..fe30711a4 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -960,30 +960,9 @@ if (!-d "skins/custom") {
mkdir "skins/custom", 0700;
}
-# Whether or not the custom skin directory has been ignored (i.e. added to
-# skins/.cvsignore).
-sub customSkinsIgnored {
- if (!-e "skins/.cvsignore") {
- return 0;
- }
- else {
- open CVSIGNORE, '<', "skins/.cvsignore";
- while (<CVSIGNORE>) {
- chomp;
- if (/^custom$/) {
- close CVSIGNORE;
- return 1;
- }
- }
- close CVSIGNORE;
- return 0;
- }
-}
-
-# If the custom skin directory hasn't been ignored, ignore it (i.e. add it to
-# skins/.cvsignore).
-if (!customSkinsIgnored()) {
+if (!-e "skins/.cvsignore") {
open CVSIGNORE, '>>', "skins/.cvsignore";
+ print CVSIGNORE ".cvsignore\n";
print CVSIGNORE "custom\n";
close CVSIGNORE;
}