releasing version 3.20100623

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 9f694e18ed739c9bcd0d245cad6986b136535d0b..2dcb424e56c57826900a50a413243a48ce840132 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -38,8 +38,8 @@ sub sanitize_wikiname ($) {
 
 sub import (@) {
        my $this=shift;
 
 sub import (@) {
        my $this=shift;

-       IkiWiki::Setup::merge({@_});

        $config{setuptype}='Standard';
        $config{setuptype}='Standard';

+       IkiWiki::Setup::merge({@_});

 
        if (! $config{force_overwrite}) {
                # Avoid overwriting any existing files.
 
        if (! $config{force_overwrite}) {
                # Avoid overwriting any existing files.


@@ -72,9 +72,15 @@ sub import (@) {
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO

+                       print STDERR "warning: do not know how to set up the bzr_wrapper hook!\n";

                }
                elsif ($config{rcs} eq 'mercurial') {
                        # TODO
                }
                elsif ($config{rcs} eq 'mercurial') {
                        # TODO

+                       print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n";
+               }
+               elsif ($config{rcs} eq 'tla') {
+                       # TODO
+                       print STDERR "warning: do not know how to set up the tla_wrapper hook!\n";

                }
                elsif ($config{rcs} eq 'cvs') {
                        $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
                }
                elsif ($config{rcs} eq 'cvs') {
                        $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";


@@ -124,9 +130,10 @@ sub import (@) {
                                IkiWiki::run_hooks(checkconfig => sub { shift->() });
                        };
                        if ($@) {
                                IkiWiki::run_hooks(checkconfig => sub { shift->() });
                        };
                        if ($@) {

+                               my $err=$@;

                                print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
                                        $plugin)."\n";
                                print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
                                        $plugin)."\n";

-                               print STDERR "$@\n";
+                               print STDERR "$err\n";

                                push @{$bakconfig{disable_plugins}}, $plugin;
                        }
                }
                                push @{$bakconfig{disable_plugins}}, $plugin;
                        }
                }