From 604037b0f258f91c323c07ff985e8732a6d73e86 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Fri, 11 Sep 2009 17:42:51 -0400
Subject: [PATCH] Don't error out, either warn or say nothing, depending.
---
IkiWiki/Plugin/rsync.pm | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 3f049457b..70dd5a4c9 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -7,7 +7,6 @@ use IkiWiki 3.00;
sub import {
hook(type => "getsetup", id => "rsync", call => \&getsetup);
- hook(type => "checkconfig", id => "rsync", call => \&checkconfig);
hook(type => "postrefresh", id => "rsync", call => \&postrefresh);
}
@@ -26,19 +25,14 @@ sub getsetup () {
},
}
-sub checkconfig {
- if (! exists $config{rsync_command} ||
- ! defined $config{rsync_command}) {
- error("Must specify rsync_command");
- }
-}
-
sub postrefresh () {
- system $config{rsync_command};
- if ($? == -1) {
- error("failed to execute rsync_command: $!");
- } elsif ($? != 0) {
- error(sprintf("rsync_command exited %d", $? >> 8));
+ if (defined $config{rsync_command}) {
+ system $config{rsync_command};
+ if ($? == -1) {
+ warn("failed to execute rsync_command: $!");
+ } elsif ($? != 0) {
+ warn(sprintf("rsync_command exited %d", $? >> 8));
+ }
}
}
--
2.39.5