ikiwiki-transition: deduplinks was broken and threw away all metadata stored by plugi...

diff --git a/debian/NEWS b/debian/NEWS
index 7daa350d95b77935bc6607fd79fd0257baeb035e..c3574bdb64c35b33e7ef40de6a4e7db88d182ce2 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,15 @@
+ikiwiki (3.13) UNRELEASED; urgency=low
+
+  The `ikiwiki-transition deduplinks` command introduced in the
+  last release was buggy. If you followed the NEWS file instructions
+  and ran it, you should run `ikiwiki -setup` to rebuild your wiki
+  to fix the problem.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 13:04:02 -0400
+

 ikiwiki (3.12) unstable; urgency=low
 
 ikiwiki (3.12) unstable; urgency=low
 

-  You may want to run `ikiwiki-transition deduplinks /path/to/srcdir`
+  You may want to run `ikiwiki-transition deduplinks your.setup`

   after upgrading to this version of ikiwiki. This command will
   optimise your wiki's saved state, removing duplicate information
   that can slow ikiwiki down.
   after upgrading to this version of ikiwiki. This command will
   optimise your wiki's saved state, removing duplicate information
   that can slow ikiwiki down.

diff --git a/debian/changelog b/debian/changelog
index c0a4afbc83b8f3fbda2927a7aa91b708c3c0f208..f25cab5bbb3d85fb2d1749eaceff0d4377eb5d1e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.13) UNRELEASED; urgency=low
     interpolation on user-supplied data when translating pagespecs.
   * ikiwiki-transition: Allow setup files to be passed to all subcommands
     that need a srcdir.
     interpolation on user-supplied data when translating pagespecs.
   * ikiwiki-transition: Allow setup files to be passed to all subcommands
     that need a srcdir.

+  * ikiwiki-transition: deduplinks was broken and threw away all
+    metadata stored by plugins in the index. Fix this bug.

 
  -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400
 

diff --git a/doc/ikiwiki-transition.mdwn b/doc/ikiwiki-transition.mdwn
index 6177f5a467b9f9f499b3332b8a77f7db70d13013..3d81d659f1108a43ff4eb9a624739b069f98d3f0 100644 (file)
--- a/doc/ikiwiki-transition.mdwn
+++ b/doc/ikiwiki-transition.mdwn
@@ -61,7 +61,7 @@ If this is not done explicitly, a user's plaintext password will be
 automatically converted to a hash when a user logs in for the first time
 after upgrade to ikiwiki 2.48.
 
 automatically converted to a hash when a user logs in for the first time
 after upgrade to ikiwiki 2.48.
 

-# deduplinks your.setup|srcdir
+# deduplinks your.setup

 
 In the past, bugs in ikiwiki have allowed duplicate link information
 to be stored in its indexdb. This mode removes such duplicate information,
 
 In the past, bugs in ikiwiki have allowed duplicate link information
 to be stored in its indexdb. This mode removes such duplicate information,

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 17a347c20833a0a4e7e8a2bffef8faf8631cd54c..398b1a3c8eb989a59258e0a846ca0cb0a5addcb0 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -184,7 +184,9 @@ sub moveprefs {
 }
 
 sub deduplinks {
 }
 
 sub deduplinks {

-       setstatedir(shift);
+       loadsetup(shift);
+       IkiWiki::loadplugins();
+       IkiWiki::checkconfig();

        IkiWiki::loadindex();
        foreach my $page (keys %links) {
                my %l;
        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 "\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;
 }
 
        exit 1;
 }