[openssl-commits] [tools] master update

[Richard Levitte]

The branch master has been updated
       via  f37c4f5e3a9ef27283a395ffd0975e78067121ea (commit)
      from  232417f8a0c556b5325d14ebc7630b776b2f1dfd (commit)


- Log -----------------------------------------------------------------
commit f37c4f5e3a9ef27283a395ffd0975e78067121ea
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 7 09:53:44 2018 +0200

    QueryApp: keep the bureau parameter key for backward compatibility

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

Summary of changes:
 QueryApp/lib/OpenSSL/Query/Role/OMC.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/QueryApp/lib/OpenSSL/Query/Role/OMC.pm b/QueryApp/lib/OpenSSL/Query/Role/OMC.pm
index 9410084..6cce602 100644
--- a/QueryApp/lib/OpenSSL/Query/Role/OMC.pm
+++ b/QueryApp/lib/OpenSSL/Query/Role/OMC.pm
@@ -17,13 +17,14 @@ use File::Spec::Functions;
 use Moo::Role;
 
 has omc => ( is => 'ro' );
+has bureau => ( is => 'ro' );	# Backward compat, omc takes precedense
 
 sub _find_file {
   my $self = shift;
   my $filename = shift;
   my $envvar = shift;
 
-  my $omc = $ENV{OMC} // $ENV{BUREAU} // $self->omc;
+  my $omc = $ENV{OMC} // $self->omc // $ENV{BUREAU} // $self->bureau;
   my @paths = ( $ENV{$envvar} // (),
 		$omc ? catfile($omc, $filename) : (),
 		catfile('.', $filename) );