* Fix re-rendering of pages when a linked to page goes away. This was broken

  in version 1.50 with the addition of %destsources. Thanks, Ethan
  Glasser-Camp.

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ef4d1123505ae8f456691899d0cab50460b03c9b..911e9c273f978d49486c176dc37c71c01ed64c6b 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -320,6 +320,11 @@ sub refresh () { #{{{
                        prune($config{destdir}."/".$_)
                                foreach @{$oldrenderedfiles{$page}};
                        delete $pagesources{$page};
+                       foreach (keys %destsources) {
+                               if ($destsources{$_} eq $page) {
+                                       delete $destsources{$_};
+                               }
+                       }
                }
        }
 

diff --git a/debian/changelog b/debian/changelog
index 743bff55aa869d3dce0190faa93252bd8d0c94f0..0ec9139574885897c94e2f1c07fcb11303460bbe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,11 @@ ikiwiki (2.5) UNRELEASED; urgency=low
   * Fix graphviz plugin to not try to read images as utf-8; they might
     sometimes contain invalid utf-8 byte sequences. Thanks,
     HenrikBrixAndersen.
+  * Fix re-rendering of pages when a linked to page goes away. This was broken
+    in version 1.50 with the addition of %destsources. Thanks, Ethan
+    Glasser-Camp.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 24 Jul 2007 22:14:41 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Jul 2007 15:30:22 -0400
 
 ikiwiki (2.4) unstable; urgency=low
 

diff --git a/doc/bugs/discussion_removal.mdwn b/doc/bugs/discussion_removal.mdwn
index 9e08361a3ecb7eeadf5986f5c44fa441e598e9cb..6da35f37ba80e6937ed004bfb0b2143cf40fdb5f 100644 (file)
--- a/doc/bugs/discussion_removal.mdwn
+++ b/doc/bugs/discussion_removal.mdwn
@@ -13,21 +13,4 @@ Here's a patch that trawls through %destsources deleting pages when they
 are found to be deleted. It's a little inelegant, but it's simple and it 
 works. --Ethan
 
-<pre>
-diff -urX ignorepats ikiwiki/IkiWiki/Render.pm ikidev/IkiWiki/Render.pm
---- ikiwiki/IkiWiki/Render.pm  2007-07-25 15:58:24.501068000 -0700
-+++ ikidev/IkiWiki/Render.pm   2007-07-25 20:08:32.966449000 -0700
-@@ -320,6 +320,11 @@
-                       prune($config{destdir}."/".$_)
-                               foreach @{$oldrenderedfiles{$page}};
-                       delete $pagesources{$page};
-+                      foreach (keys %destsources){
-+                              if ($destsources{$_} == $page) {
-+                                      delete $destsources{$_};
-+                              }
-+                      }
-               }
-       }
- 
-</pre>
-
+Thankyou for the [[patch]]! [[Done]]. --[[Joey]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index edf2a5c78f3196d7c3519203751e7a72b85da990..21310f6d459d3e91c1938a32381f64efe0619cec 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-24 22:29-0400\n"
+"POT-Creation-Date: 2007-07-26 15:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -460,37 +460,37 @@ msgstr ""
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:343
+#: ../IkiWiki/Render.pm:348
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:348
+#: ../IkiWiki/Render.pm:353
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:360
+#: ../IkiWiki/Render.pm:365
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:377
+#: ../IkiWiki/Render.pm:382
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:415
+#: ../IkiWiki/Render.pm:420
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:432
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:453
+#: ../IkiWiki/Render.pm:458
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""