[openssl-commits] [tools] master update
Richard Levitte
levitte at openssl.org
Fri Jun 16 11:56:26 UTC 2017
The branch master has been updated
via f3ff55039e7346c1c15f157df20cfe888359b367 (commit)
via e8e60e3df9e530bc9e02d81ea7be124896109c9d (commit)
via ab8e4694162f019994899dab493cdc7f2cf8e553 (commit)
via d5e65f7fc2b30baeda99a25f2196cbabd3f17c75 (commit)
via 8e02aed895bd7c93cd2439bae7b3ab8767056120 (commit)
from c73cece3320a866a6200ecd6615420b346150873 (commit)
- Log -----------------------------------------------------------------
commit f3ff55039e7346c1c15f157df20cfe888359b367
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Jun 16 13:56:11 2017 +0200
OpenSSL-Query, QueryApp: Time to bump the version to 1.0
Also, add repository and proper bugtracker info
commit e8e60e3df9e530bc9e02d81ea7be124896109c9d
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Jun 16 13:52:59 2017 +0200
OpenSSL-Query, QueryApp: change the last OpenSSLQuery to OpenSSL-Query
commit ab8e4694162f019994899dab493cdc7f2cf8e553
Author: Richard Levitte <richard at levitte.org>
Date: Fri Jun 16 10:58:04 2017 +0200
addrev: remove useless duplicate handling of --trivial
commit d5e65f7fc2b30baeda99a25f2196cbabd3f17c75
Author: Richard Levitte <richard at levitte.org>
Date: Fri Jun 16 10:57:36 2017 +0200
addrev: handle --verbose
commit 8e02aed895bd7c93cd2439bae7b3ab8767056120
Author: Richard Levitte <richard at levitte.org>
Date: Fri Jun 16 10:50:33 2017 +0200
gitaddrev: turn the debugging message to a verbosity one
-----------------------------------------------------------------------
Summary of changes:
OpenSSL-Query/Makefile.PL | 9 ++++-----
OpenSSL-Query/README.md | 3 ++-
QueryApp/Makefile.PL | 7 +++----
QueryApp/t/query_direct.t | 2 +-
review-tools/addrev | 5 +++--
review-tools/gitaddrev | 8 +++++++-
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/OpenSSL-Query/Makefile.PL b/OpenSSL-Query/Makefile.PL
index 83e953a..fc4e660 100644
--- a/OpenSSL-Query/Makefile.PL
+++ b/OpenSSL-Query/Makefile.PL
@@ -3,9 +3,9 @@ use strict;
use warnings;
use inc::Module::Install;
-name 'OpenSSLQuery';
+name 'OpenSSL-Query';
module_name 'OpenSSL::Query';
-version '0.0.1';
+version '1.0';
abstract '';
author q{Richard Levitte <levitte at openssl.org>};
license 'apache';
@@ -16,9 +16,8 @@ tests_recursive('t');
resources (
license => 'http://www.apache.org/licenses/LICENSE-2.0',
- #repository => 'git://github.com/Richard Levitte/OpenSSL-query.git',
- #repository => 'https://bitbucket.org/Richard Levitte/OpenSSL-query',
- bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=OpenSSL-query',
+ repository => 'https://github.com/openssl/tools.git',
+ bugtracker => 'https://github.com/openssl/tools/issues',
);
configure_requires (
diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md
index 182507f..dea15f2 100644
--- a/OpenSSL-Query/README.md
+++ b/OpenSSL-Query/README.md
@@ -61,6 +61,7 @@ Testing is done like this:
However, it requires that a temporary query service is started as
well. This is part of QueryApp, and is started like this:
+ $ here=`pwd`
$ cd ../QueryApp # Or wherever you have it checked out
$ PERSONDB=./t/query_data/pdb.yaml CLADB=./t/query_data/cdb.txt \
- PERL5LIB=./lib:../OpenSSLQuery/lib plackup bin/query.psgi
+ PERL5LIB=./lib:$here/lib plackup bin/query.psgi
diff --git a/QueryApp/Makefile.PL b/QueryApp/Makefile.PL
index 129140e..8fe421d 100644
--- a/QueryApp/Makefile.PL
+++ b/QueryApp/Makefile.PL
@@ -4,7 +4,7 @@ use warnings;
use inc::Module::Install;
name 'QueryApp';
-version '0.0.1';
+version '1.0';
abstract 'An OpenSSL query web app';
author q{Richard Levitte <levitte at openssl.org>};
license 'apache';
@@ -15,9 +15,8 @@ tests_recursive('t');
resources (
license => 'http://www.apache.org/licenses/LICENSE-2.0',
- #repository => 'git://github.com/Richard Levitte/OpenSSL-query.git',
- #repository => 'https://bitbucket.org/Richard Levitte/OpenSSL-query',
- bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=OpenSSL-query',
+ repository => 'https://github.com/openssl/tools.git',
+ bugtracker => 'https://github.com/openssl/tools/issues',
);
configure_requires (
diff --git a/QueryApp/t/query_direct.t b/QueryApp/t/query_direct.t
index bbd9240..e7d8ac4 100644
--- a/QueryApp/t/query_direct.t
+++ b/QueryApp/t/query_direct.t
@@ -11,7 +11,7 @@ use Test::More tests => 11;
use Data::Dumper;
use FindBin;
-# This picks up if this is part of a checkout with OpenSSLQuery
+# This picks up if this is part of a checkout with OpenSSL-Query
use if -r $FindBin::Bin.'/../../OpenSSL-Query/lib/OpenSSL/Query.pm',
lib => $FindBin::Bin.'/../../OpenSSL-Query/lib';
require OpenSSL::Query::DB; OpenSSL::Query::DB->import();
diff --git a/review-tools/addrev b/review-tools/addrev
index 7a99ea7..f4d65a8 100755
--- a/review-tools/addrev
+++ b/review-tools/addrev
@@ -18,6 +18,8 @@ foreach (@ARGV) {
$args .= "--rmreviewers ";
} elsif (/^--trivial$/) {
$args .= "--trivial ";
+ } elsif (/^--verbose$/) {
+ $args .= "--verbose ";
} elsif (/^--myemail=(.+)$/) {
$my_email = $1;
} elsif (/^--nopr$/) {
@@ -29,8 +31,6 @@ foreach (@ARGV) {
$args .= "--commit=$1 ";
} elsif (/^-(\d+)$/) {
$filterargs = "HEAD~$1..";
- } elsif (/^--trivial$/) {
- $trival = 1;
} elsif (/^--list$/) {
$list_reviewers = 1;
last;
@@ -70,6 +70,7 @@ option style arguments:
--help Print this help and exit
--list List the known reviewers and exit (discards all other
arguments)
+--verbose Be a bit more verbose
--reviewer=<reviewer> A reviewer to be added on a Reviewed-by: line
--rmreviewers Remove all existing Reviewed-by: lines before adding
reviewers
diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev
index f155e76..5889758 100755
--- a/review-tools/gitaddrev
+++ b/review-tools/gitaddrev
@@ -18,6 +18,7 @@ my $num = 0;
my $refuse = 0;
my $prnum = 0;
my $trivial = 0;
+my $verbose = 0;
my $query = OpenSSL::Query->new();
@@ -87,6 +88,8 @@ foreach (@ARGV) {
try_add_reviewer($1);
} elsif (/^--trivial$/) {
$trivial = 1;
+ } elsif (/^--verbose$/) {
+ $verbose = 1;
}
}
@@ -110,6 +113,10 @@ if (@unknown_reviewers) {
if (@nocla_reviewers) {
die "Reviewers without CLA: ", join(", ", @nocla_reviewers), "\n";
}
+
+print STDERR "Going with these reviewers:\n ", join("\n ", @reviewers), "\n"
+ if $verbose;
+
if (scalar @reviewers < 2) {
die "Too few reviewers (total must be at least 2)\n";
}
@@ -121,7 +128,6 @@ if ($skip_reviewer) {
@nocla_reviewers = grep { $_ ne $skip_reviewer } @nocla_reviewers;
@unknown_reviewers = grep { $_ ne $skip_reviewer } @unknown_reviewers;
}
-print STDERR "DEBUG: \@reviewers = ( ", join(", ", @reviewers), " )\n";
if ($skip == 1) {
my $commit_id = $ENV{GIT_COMMIT};
More information about the openssl-commits
mailing list