[Jifty-commit] r1188 - in jifty/trunk: . inc/Module lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Wed Jun 7 18:06:34 EDT 2006


Author: alexmv
Date: Wed Jun  7 18:06:34 2006
New Revision: 1188

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/inc/Module/AutoInstall.pm
   jifty/trunk/inc/Module/Install.pm
   jifty/trunk/inc/Module/Install/Metadata.pm
   jifty/trunk/lib/Jifty/Action.pm

Log:
 r13599 at zoq-fot-pik:  chmrr | 2006-06-07 13:39:48 -0400
  * Be explicit when you *don't* take an action


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Wed Jun  7 18:06:34 2006
@@ -62,6 +62,7 @@
   UNIVERSAL::require: 0
   URI: 0
   WWW::Mechanize: 1.12
+  XML::Simple: 0
   XML::Writer: 0
   XML::XPath: 0
   YAML::Syck: 0.45

Modified: jifty/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/AutoInstall.pm	(original)
+++ jifty/trunk/inc/Module/AutoInstall.pm	Wed Jun  7 18:06:34 2006
@@ -639,9 +639,7 @@
 
     # 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') )) and
-             version->can('new') 
-            ) {
+        if ( $version::VERSION or defined( _load('version') ) ) {
 
             # use version.pm if it is installed.
             return (
@@ -752,4 +750,4 @@
 
 __END__
 
-#line 990
+#line 988

Modified: jifty/trunk/inc/Module/Install.pm
==============================================================================
--- jifty/trunk/inc/Module/Install.pm	(original)
+++ jifty/trunk/inc/Module/Install.pm	Wed Jun  7 18:06:34 2006
@@ -51,22 +51,6 @@
 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: jifty/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Metadata.pm	(original)
+++ jifty/trunk/inc/Module/Install/Metadata.pm	Wed Jun  7 18:06:34 2006
@@ -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 || {} });
 }

Modified: jifty/trunk/lib/Jifty/Action.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action.pm	(original)
+++ jifty/trunk/lib/Jifty/Action.pm	Wed Jun  7 18:06:34 2006
@@ -162,7 +162,10 @@
 sub run {
     my $self = shift;
     $self->log->debug("Running action");
-    return unless $self->result->success;
+    unless ($self->result->success) {
+        $self->log->debug("Not taking action, as it doesn't validate");
+        return;
+    }
     $self->log->debug("Taking action");
     $self->take_action;
     $self->cleanup;


More information about the Jifty-commit mailing list