]> sipb.mit.edu Git - ikiwiki.git/commitdiff
move File::Find control back into its code blocks
authorJoey Hess <joey@kitenet.net>
Sat, 17 Apr 2010 20:14:15 +0000 (16:14 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 17 Apr 2010 20:14:15 +0000 (16:14 -0400)
Ok, this is longer, but features less scary action at a distance.

IkiWiki/Render.pm

index fff9dcce610e76be5c7ebf5e32bcd7b5c7ed7e69..41f179a500b03e8e8ce84b7386daa40c4aea762c 100644 (file)
@@ -291,7 +291,6 @@ sub verify_src_file ($$) {
        my $page = pagename($file);
        if (! exists $pagesources{$page} &&
                file_pruned($file)) {
        my $page = pagename($file);
        if (! exists $pagesources{$page} &&
                file_pruned($file)) {
-               $File::Find::prune=1;
                return;
        }
 
                return;
        }
 
@@ -318,6 +317,9 @@ sub find_src_files () {
                                }
                                $pages{$page}=1;
                        }
                                }
                                $pages{$page}=1;
                        }
+                       else {
+                               $File::Find::prune=1;
+                       }
                },
        }, $config{srcdir});
        foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
                },
        }, $config{srcdir});
        foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
@@ -336,6 +338,9 @@ sub find_src_files () {
                                                }
                                        }
                                }
                                                }
                                        }
                                }
+                               else {
+                                       $File::Find::prune=1;
+                               }
                        },
                }, $dir);
        };
                        },
                }, $dir);
        };