From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 22:20:23 +0000 (-0400)
Subject: Merge commit 'schmonz/master'
X-Git-Tag: 3.14159265~50
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c6ac7409bd95af94257f8bd6e5d5fd2530a4aa63?hp=-c

Merge commit 'schmonz/master'

Conflicts:
	IkiWiki/Plugin/rsync.pm
---

c6ac7409bd95af94257f8bd6e5d5fd2530a4aa63
diff --combined IkiWiki/Plugin/rsync.pm
index 7c3fc127c,70dd5a4c9..9afbe9487
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@@ -7,7 -7,6 +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);
  }
  
@@@ -19,27 -18,21 +18,23 @@@ sub getsetup () 
  		},
  		rsync_command => {
  			type => "string",
 -			example => "rsync -qa --delete /path/to/destdir/ user\@host:/path/to/docroot/",
 -			description => "unattended command to upload regenerated pages",
 +			example => "rsync -qa --delete . user\@host:/path/to/docroot/",
 +			description => "command to run to sync updated pages",
  			safe => 0,
  			rebuild => 0,
  		},
  }
  
- sub checkconfig {
- 	if (! exists $config{rsync_command} ||
- 	    ! defined $config{rsync_command}) {
- 		error("Must specify rsync_command");
- 	}
- }
- 
  sub postrefresh () {
- 	chdir($config{destdir}) || error("chdir: $!");
- 	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}) {
++		chdir($config{destdir}) || error("chdir: $!");
+ 		system $config{rsync_command};
+ 		if ($? == -1) {
+ 			warn("failed to execute rsync_command: $!");
 -		} elsif ($? != 0) {
++		}
++		elsif ($? != 0) {
+ 			warn(sprintf("rsync_command exited %d", $? >> 8));
+ 		}
  	}
  }