diff options
author | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-04-20 12:21:18 +0200 |
commit | 4558457402a4ab6bc795589a2e400fa66144f76e (patch) | |
tree | 8368320617a8febc3c9c9708f688b6591801f4c0 /IkiWiki/Setup/Automator.pm | |
parent | 9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff) | |
parent | 2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff) |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Diffstat (limited to 'IkiWiki/Setup/Automator.pm')
-rw-r--r-- | IkiWiki/Setup/Automator.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 7d9eca3af..5111541e4 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -58,6 +58,9 @@ sub import (@) { elsif ($config{rcs} eq 'monotone') { $config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook"; } + elsif ($config{rcs} eq 'darcs') { + $config{darcs_wrapper}=$config{repository}."/_darcs/ikiwiki-wrapper"; + } elsif ($config{rcs} eq 'bzr') { # TODO } @@ -117,6 +120,7 @@ sub import (@) { for (;;) { print "Choose a password: "; chomp($password=<STDIN>); + print "\n"; print "Confirm password: "; chomp($password2=<STDIN>); |