Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(632)

Unified Diff: third_party/devscripts/licensecheck.pl

Issue 8094004: Make the license tools recoginze the dual license (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/devscripts/chromium-1.patch ('k') | tools/checklicenses/checklicenses.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/devscripts/licensecheck.pl
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl
index 1afbacdd6e98b16a4b57c873fd40d50691c8035f..9e12df16973f4a92ffa8e2d95cde7369383916d4 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -470,7 +470,9 @@ sub parselicense($) {
$license = "Perl $license";
}
- if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
+ if ($licensetext =~ /under the terms of the Apache ([^ ]+) License OR version 2 of the GNU/) {
+ $license = "Apache (v$1) GPL (v2) $license";
+ } elsif ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
$license = "Apache (v$1) $license";
}
« no previous file with comments | « third_party/devscripts/chromium-1.patch ('k') | tools/checklicenses/checklicenses.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698