saner return codes for check_can{remove,rename}

[git.ikiwiki.info.git] / IkiWiki / Plugin / rsync.pm

diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 9afbe948728507c5a72fbea480919c6c43ddd15c..e38801e4a110b0b9e4790935de65f08bce30441e 100644 (file)
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -7,7 +7,8 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "getsetup", id => "rsync", call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "rsync", call => \&getsetup);

-       hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
+       hook(type => "change", id => "rsync", call => \&postrefresh);
+       hook(type => "delete", id => "rsync", call => \&postrefresh);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -25,15 +26,18 @@ sub getsetup () {
                },
 }
 
                },
 }
 

+my $ran=0;
+

 sub postrefresh () {
 sub postrefresh () {

-       if (defined $config{rsync_command}) {
+       if (defined $config{rsync_command} && ! $ran) {
+               $ran=1;

                chdir($config{destdir}) || error("chdir: $!");
                system $config{rsync_command};
                if ($? == -1) {
                chdir($config{destdir}) || error("chdir: $!");
                system $config{rsync_command};
                if ($? == -1) {

-                       warn("failed to execute rsync_command: $!");
+                       warn(sprintf(gettext("failed to execute rsync_command: %s"), $!))."\n";

                }
                elsif ($? != 0) {
                }
                elsif ($? != 0) {

-                       warn(sprintf("rsync_command exited %d", $? >> 8));
+                       warn(sprintf(gettext("rsync_command exited %d"), $? >> 8))."\n";

                }
        }
 }
                }
        }
 }