[Jifty-commit] r490 - in jifty/trunk: . lib/Jifty

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Mon Jan  9 18:10:38 2006
New Revision: 490

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/lib/Jifty/Dispatcher.pm
   jifty/trunk/lib/Jifty/Manual/Tutorial.pod

Log:
 r8618 at zoq-fot-pik:  chmrr | 2006-01-09 18:09:59 -0500
  * Only die if there actually is something to complain about


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Mon Jan  9 18:10:38 2006
@@ -1,5 +1,5 @@
 distribution_type: module
-generated_by: Module::Install version 0.510
+generated_by: Module::Install version 0.520
 license: unknown
 name: Jifty
 no_index:

Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm	Mon Jan  9 18:10:38 2006
@@ -584,7 +584,7 @@
 sub _do_redirect {
     my ( $self, $path ) = @_;
     eval {Jifty->web->redirect($path);};
-    die $@ unless ( UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
+    die $@ if ( $@ and not UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
     last_rule;
 }
 
@@ -599,7 +599,7 @@
 sub _do_abort {
     my $self = shift;
     eval {Jifty->web->mason->abort(@_)};
-    die $@ unless ( UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
+    die $@ if ( $@ and not UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
     last_rule;
 }
 
@@ -626,7 +626,7 @@
             Jifty->web->mason->comp( $path, %{ $self->{args} } );
         }
     };
-    die $@ unless ( UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
+    die $@ if ( $@ and not UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
     last_rule;
 }
 
@@ -672,7 +672,7 @@
         HANDLER: {
             $self->_handle_rules( [ $self->rules('SETUP') ] );
             eval {Jifty->web->handle_request();};
-            die $@ unless ( UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
+            die $@ if ( $@ and not UNIVERSAL::isa $@, 'HTML::Mason::Exception::Abort' ) ;
             $self->_handle_rules( [ $self->rules('RUN'), 'show' ] );
             $self->_handle_rules( [ $self->rules('CLEANUP') ] );
         }

Modified: jifty/trunk/lib/Jifty/Manual/Tutorial.pod
==============================================================================
--- jifty/trunk/lib/Jifty/Manual/Tutorial.pod	(original)
+++ jifty/trunk/lib/Jifty/Manual/Tutorial.pod	Mon Jan  9 18:10:38 2006
@@ -332,8 +332,8 @@
   my $posts = MyWeblog::Model::PostCollection->new();
   $posts->unlimit();
   $posts->set_page_info( current_page => $page,
-                             per_page     => 25
-                            );
+                         per_page     => 25
+                       );
   $m->out("No items found.") if ($posts->pager->total_entries == 0);
 
   </%init>
@@ -376,8 +376,8 @@
   <%init>
   my $top = Jifty->web->navigation;
   $top->child( Home => url => "/");
-  $top->child( Post  => url => "/post", 
-                        label => "Post Article");
+  $top->child( Post => url => "/post", 
+                       label => "Post Article");
   </%init>
 
 For more information about the menu system, see the documentation in
@@ -392,7 +392,7 @@
 Please join us on the C<jifty-devel> mailing list to talk about how you're 
 using Jifty or what you find difficult or hard to use about it.
 
-=head1 GETTING HELP
+ /=head1 GETTING HELP
 
 =head2 Joining the mailing list