From 11a4ad8a4da24594f85df7f70915ce5743d1b949 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Aug 2008 21:02:18 -0400 Subject: add a guard against multiple cgi or rcs wrappers --- ikiwiki-transition | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'ikiwiki-transition') 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} -- cgit v1.2.3