[Rt-commit] rt branch, 4.0/update-ckeditor-to-3.6.6, updated. rt-4.0.11rc1-2-gd5c4484

[Alex Vandiver]

The branch, 4.0/update-ckeditor-to-3.6.6 has been updated
       via  d5c44844b269e2e35b0f20d796f5ce876e3b4662 (commit)
      from  f1df5b606a5de0cd267b3a77fc0f101c9075e408 (commit)

Summary of changes:
 devel/tools/license_tag | 2 +-
 t/99-policy.t           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit d5c44844b269e2e35b0f20d796f5ce876e3b4662
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Apr 2 01:19:03 2013 -0400

    Skip ckeditor files for license tags, not just fckeditor files
    
    19efd7e added rules to check for proper license tagging, pulling its
    regular expression of paths to skip from the license tagger.  The
    latter, however, had not been updated for the FCKeditor -> ckeditor
    change of 4d1ccc6, leading to false positives in the recent ckeditor
    upgrade.
    
    Skip all paths that contain ckeditor, not fckeditor, as the latter is no
    longer in use.

diff --git a/devel/tools/license_tag b/devel/tools/license_tag
index 03992d1..05bcf83 100755
--- a/devel/tools/license_tag
+++ b/devel/tools/license_tag
@@ -254,7 +254,7 @@ sub another_license {
     my $name = shift;
     my $file = shift;
 
-    return 1 if ($name =~ /(?:FCKEditor|scriptaculous|superfish|tablesorter|farbtastic)/i);
+    return 1 if ($name =~ /(?:ckeditor|scriptaculous|superfish|tablesorter|farbtastic)/i);
 
     return 0 if $file =~ /Copyright\s+\(c\)\s+\d\d\d\d-\d\d\d\d Best Practical Solutions/i;
     return 1 if $file =~ /\b(copyright|GPL|Public Domain)\b/i; # common
diff --git a/t/99-policy.t b/t/99-policy.t
index 22f64ea..5b6170b 100644
--- a/t/99-policy.t
+++ b/t/99-policy.t
@@ -52,7 +52,7 @@ sub check {
 
         $check{bps_tag} = -1 if $check{bps_tag} == 1
             and not $content =~ /Copyright\s+\(c\)\s+\d\d\d\d-\d\d\d\d Best Practical Solutions/i
-                and $file =~ /(?:FCKEditor|scriptaculous|superfish|tablesorter|farbtastic)/i;
+                and $file =~ /(?:ckeditor|scriptaculous|superfish|tablesorter|farbtastic)/i;
         $check{bps_tag} = -1 if $check{bps_tag} == 1
             and not $content =~ /Copyright\s+\(c\)\s+\d\d\d\d-\d\d\d\d Best Practical Solutions/i
                 and ($content =~ /\b(copyright|GPL|Public Domain)\b/i

-----------------------------------------------------------------------