You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/02/06 16:47:35 UTC

[4/4] lucy git commit: Require specific Clownfish version in Lucy.pm

Require specific Clownfish version in Lucy.pm

Fixes LUCY-273.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/530498d8
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/530498d8
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/530498d8

Branch: refs/heads/master
Commit: 530498d8852c704280d6cb2e124b0b728a3f70b4
Parents: fca8591
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Feb 6 16:37:28 2016 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Feb 6 16:37:28 2016 +0100

----------------------------------------------------------------------
 devel/bin/update_version | 4 ++++
 perl/lib/Lucy.pm         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/530498d8/devel/bin/update_version
----------------------------------------------------------------------
diff --git a/devel/bin/update_version b/devel/bin/update_version
index 3085ff9..8e464dd 100755
--- a/devel/bin/update_version
+++ b/devel/bin/update_version
@@ -74,6 +74,10 @@ $buf =~ s/(our \$VERSION\ +=\ +)'.+?'/$1'$x_yyyzzz_version'/g
     or die "no match";
 $buf =~ s/(bootstrap\s+Lucy\s+)'[\d\._]+'/$1'$x_y_z_d_version'/
     or die "no match";
+if ( $z == 0 && $dev == 0 ) {
+    $buf =~ s/(use Clownfish +)[\d\._]+/$1$x_yyyzzz_version/g
+        or die "no match";
+}
 write_file( 'perl/lib/Lucy.pm', $buf );
 
 # Update Lucy.pod.

http://git-wip-us.apache.org/repos/asf/lucy/blob/530498d8/perl/lib/Lucy.pm
----------------------------------------------------------------------
diff --git a/perl/lib/Lucy.pm b/perl/lib/Lucy.pm
index dd03ecc..715f055 100644
--- a/perl/lib/Lucy.pm
+++ b/perl/lib/Lucy.pm
@@ -23,7 +23,7 @@ use 5.008003;
 our $VERSION = '0.004000';
 $VERSION = eval $VERSION;
 
-use Clownfish;
+use Clownfish 0.004000;
 use Exporter 'import';
 BEGIN {
     our @EXPORT_OK = qw(