From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 27 Jul 2009 20:22:26 +0000 (+0200)
Subject: img: Fix adding of dependency from page to the image.
X-Git-Tag: 3.15~77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d96250fc5749611ffb954f746fa02147ed29f39;p=ikiwiki.git

img: Fix adding of dependency from page to the image.

This was impressively broken. add_depends was being called with params
backwards, and on parameter was set to the name of the generated
file, which isn't in the source.

Now updates to images will update the page that contains them, thus
updating them. This is unncessary for fullsize images, so skipped.
---

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 44d67bd83..68b001671 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -44,6 +44,7 @@ sub preprocess (@) {
 	}
 
 	add_link($params{page}, $image);
+
 	# optimisation: detect scan mode, and avoid generating the image
 	if (! defined wantarray) {
 		return;
@@ -65,6 +66,8 @@ sub preprocess (@) {
 	my $r;
 
 	if ($params{size} ne 'full') {
+		add_depends($params{page}, $image);
+
 		my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
 		error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
 			unless (defined $w && defined $h &&
@@ -102,8 +105,6 @@ sub preprocess (@) {
 		$imglink = $file;
 	}
 
-	add_depends($imglink, $params{page});
-
 	my ($fileurl, $imgurl);
 	if (! $params{preview}) {
 		$fileurl=urlto($file, $params{destpage});
diff --git a/debian/changelog b/debian/changelog
index 565f19c7c..aa1493960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low
   * Add further build machinery to generate translated underlays from
     the po file, for use by wikis whose primary language is not English.
   * Add Danish basewiki translation by Jonas Smedegaard.
+  * img: Fix adding of dependency from page to the image.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400