X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=ikiwiki-transition;h=e42a5137c72f4ef403aeda4e117944e575928d6d;hb=4ff161ba0b4b2fbb027ee2077330c08bd3a38073;hp=a257347a1ad1da259ecb23ebc9d56f3269f62c5b;hpb=ea6dc3832585d8aca784c21d6f91436848a45039;p=ikiwiki.git

diff --git a/ikiwiki-transition b/ikiwiki-transition
index a257347a1..e42a5137c 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -130,14 +130,24 @@ sub setupformat {
 	IkiWiki::checkconfig();
 	
 	# unpack old-format wrappers setting into new fields
+	my $cgi_seen=0;
+	my $rcs_seen=0;
 	foreach my $wrapper (@{$config{wrappers}}) {
 		if ($wrapper->{cgi}) {
+			if ($cgi_seen) {
+				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
+			}
+			$cgi_seen++;
 			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
 			$config{cgi_wrapper}=$wrapper->{wrapper};
 			$config{cgi_wrappermode}=$wrapper->{wrappermode}
 				if exists $wrapper->{wrappermode};
 		}
 		elsif ($config{rcs}) {
+			if ($rcs_seen) {
+				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
+			}
+			$rcs_seen++;
 			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
 			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
 			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}