po plugin: do not trust po4a functions return value

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index a54b53817bfbbf726d26ce298fdc8b4eb2a4479f..88e9f3d245c95a2da545b1899d0d4f2a468dbd93 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -37,11 +37,13 @@ sub import (@) { #{{{
        foreach my $key (qw{srcdir destdir repository dumpsetup}) {
                next unless exists $config{$key};
                my $add="";
        foreach my $key (qw{srcdir destdir repository dumpsetup}) {
                next unless exists $config{$key};
                my $add="";

-               while (-e $add.$config{$key}) {
+               my $dir=IkiWiki::dirname($config{$key})."/";
+               my $base=IkiWiki::basename($config{$key});
+               while (-e $dir.$add.$base) {

                        $add=1 if ! $add;
                        $add++;
                }
                        $add=1 if ! $add;
                        $add++;
                }

-               $config{$key}=$add.$config{$key};
+               $config{$key}=$dir.$add.$base;

        }
        
        # Set up wrapper
        }
        
        # Set up wrapper


@@ -52,6 +54,9 @@ sub import (@) { #{{{
                elsif ($config{rcs} eq 'svn') {
                        $config{svn_wrapper}=$config{repository}."/hooks/post-commit";
                }
                elsif ($config{rcs} eq 'svn') {
                        $config{svn_wrapper}=$config{repository}."/hooks/post-commit";
                }

+               elsif ($config{rcs} eq 'monotone') {
+                       $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
+               }

                elsif ($config{rcs} eq 'bzr') {
                        # TODO
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO
                }