X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/041923a89ece8b1ed195cb7b528843c15770ea6f..8ded9f57a12a27fa5fc1e272ec7b2d2a5aa28419:/IkiWiki/Plugin/monotone.pm

diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index a591ecec5..f31a8606b 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -11,9 +11,6 @@ use Date::Format qw(time2str);
 my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
 
 sub import { #{{{
-	if (exists $IkiWiki::hooks{rcs}) {
-		error(gettext("cannot use multiple rcs plugins"));
-	}
 	hook(type => "checkconfig", id => "monotone", call => \&checkconfig);
 	hook(type => "getsetup", id => "monotone", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -58,7 +55,7 @@ sub checkconfig () { #{{{
 		error("Monotone version too old, is $version but required 0.38");
 	}
 
-	if (length $config{mtn_wrapper}) {
+	if (defined $config{mtn_wrapper} && length $config{mtn_wrapper}) {
 		push @{$config{wrappers}}, {
 			wrapper => $config{mtn_wrapper},
 			wrappermode => (defined $config{mtn_wrappermode} ? $config{mtn_wrappermode} : "06755"),
@@ -68,10 +65,14 @@ sub checkconfig () { #{{{
 
 sub getsetup () { #{{{
 	return
+		plugin => {
+			safe => 0, # rcs plugin
+			rebuild => undef,
+		},
 		mtn_wrapper => {
 			type => "string",
 			example => "/srv/mtn/wiki/_MTN/ikiwiki-netsync-hook",
-			description => "monotone netsync hook executable to generate",
+			description => "monotone netsync hook to generate",
 			safe => 0, # file
 			rebuild => 0,
 		},