[Rt-commit] r5569 - in DBIx-SearchBuilder/trunk: .
inc/Module/Install
trs at bestpractical.com
trs at bestpractical.com
Wed Jul 12 20:44:10 EDT 2006
Author: trs
Date: Wed Jul 12 20:44:08 2006
New Revision: 5569
Modified:
DBIx-SearchBuilder/trunk/ (props changed)
DBIx-SearchBuilder/trunk/META.yml
DBIx-SearchBuilder/trunk/SearchBuilder.pm
DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm
DBIx-SearchBuilder/trunk/inc/Module/Install.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm
DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm
Log:
r14303 at zot: tom | 2006-07-12 20:43:55 -0400
* Fix bug in Limit that caused a lowercase "startswith" or "endswith" not to be replaced by "like"
* Update M::I
Modified: DBIx-SearchBuilder/trunk/META.yml
==============================================================================
--- DBIx-SearchBuilder/trunk/META.yml (original)
+++ DBIx-SearchBuilder/trunk/META.yml Wed Jul 12 20:44:08 2006
@@ -2,7 +2,7 @@
DBD::SQLite: 0
Test::More: 0.52
distribution_type: module
-generated_by: Module::Install version 0.62
+generated_by: Module::Install version 0.63
license: perl
name: DBIx-SearchBuilder
no_index:
Modified: DBIx-SearchBuilder/trunk/SearchBuilder.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/SearchBuilder.pm (original)
+++ DBIx-SearchBuilder/trunk/SearchBuilder.pm Wed Jul 12 20:44:08 2006
@@ -742,11 +742,11 @@
}
elsif ( $args{'OPERATOR'} =~ /STARTSWITH/i ) {
$args{'VALUE'} = $args{'VALUE'} . "%";
- $args{'OPERATOR'} =~ s/STARTSWITH/LIKE/;
+ $args{'OPERATOR'} =~ s/STARTSWITH/LIKE/i;
}
elsif ( $args{'OPERATOR'} =~ /ENDSWITH/i ) {
$args{'VALUE'} = "%" . $args{'VALUE'};
- $args{'OPERATOR'} =~ s/ENDSWITH/LIKE/;
+ $args{'OPERATOR'} =~ s/ENDSWITH/LIKE/i;
}
$args{'OPERATOR'} =~ s/MATCHES/LIKE/i; # MATCHES becomes LIKE, with no % stuff
Modified: DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/AutoInstall.pm Wed Jul 12 20:44:08 2006
@@ -639,7 +639,9 @@
# check for version numbers that are not in decimal format
if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
- if ( $version::VERSION or defined( _load('version') ) ) {
+ if ( ( $version::VERSION or defined( _load('version') )) and
+ version->can('new')
+ ) {
# use version.pm if it is installed.
return (
@@ -750,4 +752,4 @@
__END__
-#line 988
+#line 990
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install.pm Wed Jul 12 20:44:08 2006
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.62';
+ $VERSION = '0.63';
}
# Whether or not inc::Module::Install is actually loaded, the
@@ -51,6 +51,22 @@
END_DIE
}
+# If the script that is loading Module::Install is from the future,
+# then make will detect this and cause it to re-run over and over
+# again. This is bad. Rather than taking action to touch it (which
+# is unreliable on some platforms and requires write permissions)
+# for now we should catch this and refuse to run.
+if ( -f $0 and (stat($0))[9] > time ) {
+ die << "END_DIE";
+Your installer $0 has a modification time in the future.
+
+This is known to create infinite loops in make.
+
+Please correct this, then run $0 again.
+
+END_DIE
+}
+
use Cwd ();
use File::Find ();
use File::Path ();
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/AutoInstall.pm Wed Jul 12 20:44:08 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.63';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Base.pm Wed Jul 12 20:44:08 2006
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.62';
+$VERSION = '0.63';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Include.pm Wed Jul 12 20:44:08 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.63';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Makefile.pm Wed Jul 12 20:44:08 2006
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.63';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm (original)
+++ DBIx-SearchBuilder/trunk/inc/Module/Install/Metadata.pm Wed Jul 12 20:44:08 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.63';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -123,9 +123,9 @@
require Module::Build;
my $build = Module::Build->new(
- dist_name => $self->{name},
- dist_version => $self->{version},
- license => $self->{license},
+ dist_name => $self->name,
+ dist_version => $self->version,
+ license => $self->license,
);
$self->provides(%{ $build->find_dist_packages || {} });
}
More information about the Rt-commit
mailing list