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

Unified Diff: third_party/devscripts/licensecheck.pl

Issue 8486004: Update licensecheck to 2.11.2, which contains upstreamed patches: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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/README.chromium ('k') | third_party/devscripts/licensecheck.pl.orig » ('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 40057ccba587e33fd925ba62dc3b8beb00f0b296..901e52920ae3cb962f83059817078083fa260f6b 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -125,7 +125,7 @@ Adam D. Barratt <adam@adam-barratt.org.uk>
use strict;
use warnings;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
use File::Basename;
sub fatal($);
@@ -430,6 +430,8 @@ sub parselicense($) {
$license = "MIT/X11 (BSD like) $license";
} elsif ($licensetext =~ /Permission is hereby granted, free of charge, to any person obtaining a copy of this software and(\/or)? associated documentation files \(the (Software|Materials)\), to deal in the (Software|Materials)/) {
$license = "MIT/X11 (BSD like) $license";
+ } elsif ($licensetext =~ /Permission is hereby granted, without written agreement and without license or royalty fees, to use, copy, modify, and distribute this software and its documentation for any purpose/) {
+ $license = "MIT/X11 (BSD like) $license";
}
if ($licensetext =~ /Permission to use, copy, modify, and(\/or)? distribute this software for any purpose with or without fee is hereby granted, provided.*copyright notice.*permission notice.*all copies/) {
« no previous file with comments | « third_party/devscripts/README.chromium ('k') | third_party/devscripts/licensecheck.pl.orig » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698