From bb0cbecbc377c3966f177b210fcfabe487d0452c Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Wed, 23 May 2007 01:44:11 +0000
Subject: [PATCH] * Correct bug in the img plugin that caused dependencies on
 images to not   always be tracked correctly.

---
 IkiWiki/Plugin/img.pm | 18 +++++++++++++++---
 debian/changelog      |  4 +++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 7226231a0..7e167240e 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -31,9 +31,17 @@ sub preprocess (@) { #{{{
 		return '';
 	}
 
-	add_depends($params{page}, $image);
-	my $file = bestlink($params{page}, $image)
-		|| return "[[img ".sprintf(gettext("%s not found"), $image)."]]";
+	my $file = bestlink($params{page}, $image);
+	if (! $file) {
+		# TODO: this may not be right, depending on where the file is
+		# created in the end
+		add_depends($params{page}, $image);
+
+		return "[[img ".sprintf(gettext("%s not found"), $image)."]]";
+	}
+	else {
+		add_depends($params{page}, $file);
+	}
 
 	my $dir = IkiWiki::dirname($file);
 	my $base = IkiWiki::basename($file);
@@ -93,6 +101,10 @@ sub preprocess (@) { #{{{
 		$imgurl="$config{url}/$imglink";
 	}
 
+	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
+		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+	}
+
 	return '<a href="'.$fileurl.'"><img src="'.$imgurl.
 		'" alt="'.$alt.'" width="'.$im->Get("width").
 		'" height="'.$im->Get("height").'" /></a>';
diff --git a/debian/changelog b/debian/changelog
index 331075db2..ef262ab04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ ikiwiki (2.2) UNRELEASED; urgency=low
     When aggregating, it does not wait for the lock if it cannot get it, and
     instead exits, to prevent aggregating processes from piling up.
   * Updated Spanish translation from Victor Moral.
+  * Correct bug in the img plugin that caused dependencies on images to not
+    always be tracked correctly.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 21 May 2007 13:18:37 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 22 May 2007 21:29:13 -0400
 
 ikiwiki (2.1) unstable; urgency=low
 
-- 
2.45.0