diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /ikiwiki-transition | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
| download | ikiwiki-86edd73d169600875a10a635ef8df4a644545b0d.tar ikiwiki-86edd73d169600875a10a635ef8df4a644545b0d.tar.gz | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'ikiwiki-transition')
| -rwxr-xr-x | ikiwiki-transition | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ikiwiki-transition b/ikiwiki-transition index 7e99c878e..398b1a3c8 100755 --- a/ikiwiki-transition +++ b/ikiwiki-transition @@ -184,7 +184,9 @@ sub moveprefs { } sub deduplinks { - setstatdir(shift); + loadsetup(shift); + IkiWiki::loadplugins(); + IkiWiki::checkconfig(); IkiWiki::loadindex(); foreach my $page (keys %links) { my %l; @@ -237,7 +239,7 @@ sub usage { print STDERR "\tmoveprefs setupfile\n"; print STDERR "\thashpassword setupfile|srcdir\n"; print STDERR "\tindexdb setupfile|srcdir\n"; - print STDERR "\tdeduplinks setupfile|srcdir\n"; + print STDERR "\tdeduplinks setupfile\n"; exit 1; } |