From db5fc47e2022a18038e3877f69a708532b64969c Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Sun, 12 Apr 2015 16:23:55 +0100 Subject: Fix incorrect rfc.sh and checkpatch.pl use of "jenkins" instead of "gerrit" Change-Id: I6e78477554097a2be5aad8e3fb196970fb30dac2 Signed-off-by: Justin Clift Reviewed-on: http://review.gluster.org/10203 Tested-by: NetBSD Build System Reviewed-by: Niels de Vos Reviewed-by: Kaleb KEITHLEY --- extras/checkpatch.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'extras') diff --git a/extras/checkpatch.pl b/extras/checkpatch.pl index 7402e2a6556..5a314258142 100755 --- a/extras/checkpatch.pl +++ b/extras/checkpatch.pl @@ -44,7 +44,7 @@ my $configuration_file = ".checkpatch.conf"; my $max_line_length = 80; my $ignore_perl_version = 0; my $minimum_perl_version = 5.10.0; -my $jenkins_url = $ENV{JENKINS_URL}; +my $gerrit_url = $ENV{GERRIT_URL}; sub help { my ($exitcode) = @_; @@ -57,7 +57,7 @@ Options: -q, --quiet quiet --patch treat FILE as patchfile (default) --emacs emacs compile window format - --jenkins-url=STRING provide URL patch was reviewed on + --gerrit-url=STRING URL the patch was reviewed at --terse one line per report -f, --file treat FILE as regular source file --subjective, --strict enable more subjective tests @@ -121,7 +121,7 @@ GetOptions( 'q|quiet+' => \$quiet, 'patch!' => \$chk_patch, 'emacs!' => \$emacs, - 'jenkins-url=s' => \$jenkins_url, + 'gerrit-url=s' => \$gerrit_url, 'terse!' => \$terse, 'f|file!' => \$file, 'subjective!' => \$check, @@ -1951,11 +1951,11 @@ sub process { } } - # Check if email is really Jenkins URL + # Check if email is really Gerrit URL if ($email =~ /^($url_tags)(.*)/) { my $uri = $1; my $url = $2; - if ($uri && $url !~ /$jenkins_url/) { + if ($uri && $url !~ /$gerrit_url/) { ERROR("BAD_URL", "Unrecognized url address: '$email'\n" . $herecurr); } -- cgit