[Yapcom-commit] rev 117 - yapcom/trunk/lib/YAPC

[prev] [thread] [next] [lurker] [Date index for 2003/12/15]

From: svn
Subject: [Yapcom-commit] rev 117 - yapcom/trunk/lib/YAPC
Date: 09:48 on 15 Dec 2003
Author: gabor
Date: 2003-12-15 09:48:27 +0200 (Mon, 15 Dec 2003)
New Revision: 117

Modified:
   yapcom/trunk/lib/YAPC/Organizer.pm
Log:
eliminate unnecesary warnings about Replacing previous run-mode

Modified: yapcom/trunk/lib/YAPC/Organizer.pm
===================================================================
--- yapcom/trunk/lib/YAPC/Organizer.pm	2003-12-14 21:00:13 UTC (rev 116)
+++ yapcom/trunk/lib/YAPC/Organizer.pm	2003-12-15 07:48:27 UTC (rev 117)
@@ -63,10 +63,15 @@
 
    my $page = get_page();
 
+   $SIG{__WARN__} = sub {
+      if ($_[0] !~ /Replacing previous run-mode/) {
+         warn $_[0];
+      }
+   }; # silence the unnecessary warning about changing run_mode
    if (grep {$_ eq $page} @other_pages) {
       return $self->prerun_mode($page);
    }
-
+   
 #   my $id = 1;
    my $id;
    if (grep {$_ eq $page} (@user_pages, @admin_pages)) {
@@ -94,6 +99,7 @@
    unless (-f "$skins_dir/$page.tmpl" or -f "$templates_dir/$page.tmpl") {
       #warn "YAPC script called for not existing file. Original: '$ENV{PATH_INFO}' cut down: '$page'\n";
       $self->prerun_mode('no_such_page');
+      #return; # Gabor thinks this should be here but this breaks the tests
    }
    $self->prerun_mode('default');
 }

Generated at 15:25 on 17 Dec 2003 by mariachi 0.52