* perl is broken: print "" || die fails! Work around this insanity.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bbc857214a361fff020063165a17af79c421362b..40622a5beacdbd2844d7a09f1584436f2b7064bf 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -292,7 +292,9 @@ sub writefile ($$$;$$) { #{{{
                $writer->(\*OUT, $cleanup);
        }
        else {
                $writer->(\*OUT, $cleanup);
        }
        else {

-               print OUT $content || error("failed writing to $newfile: $!", $cleanup);
+               if (length $content) {
+                       print OUT $content || error("failed writing to $newfile: $!", $cleanup);
+               }

        }
        close OUT || error("failed saving $newfile: $!", $cleanup);
        rename($newfile, "$destdir/$file") || 
        }
        close OUT || error("failed saving $newfile: $!", $cleanup);
        rename($newfile, "$destdir/$file") || 

diff --git a/debian/changelog b/debian/changelog
index 6c0c506892c40ee6081cb4a53f41fd0dd4ece99d..b70a7cf899a38b9abd4b0a231ceeee75bab548a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,9 @@ ikiwiki (1.44) UNRELEASED; urgency=low
   * Make img plugin not fail immediately if Image::Magick is not available.
     This lets ikiwiki not build depend on perlmagic.
   * Detect old versions of xgettext and avoid using them.
   * Make img plugin not fail immediately if Image::Magick is not available.
     This lets ikiwiki not build depend on perlmagic.
   * Detect old versions of xgettext and avoid using them.

+  * perl is broken: print "" || die fails! Work around this insanity.

 
 

- -- Joey Hess <joeyh@debian.org>  Tue, 20 Feb 2007 04:43:31 -0500
+ -- Joey Hess <joeyh@debian.org>  Tue, 20 Feb 2007 17:13:37 -0500

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

diff --git a/doc/patchqueue/index.html_allowed.mdwn b/doc/patchqueue/index.html_allowed.mdwn
index 528eb7d3982b99cca0736cf6d8d7d0ed675ac15a..2431b802a8b7169c7b41354d332cea458353f5cf 100644 (file)
--- a/doc/patchqueue/index.html_allowed.mdwn
+++ b/doc/patchqueue/index.html_allowed.mdwn
@@ -410,6 +410,9 @@ Index: linkmap.pm
 > This is probably supposed to be `$mapitems{$item}=urlto($item, $params{destpage});`,
 > which does indeed remove one more `htmlpage` call from the plugins. I can't actually
 > try it: "failed writing to dst/ts.png.ikiwiki-new: Inappropriate ioctl for device".
 > This is probably supposed to be `$mapitems{$item}=urlto($item, $params{destpage});`,
 > which does indeed remove one more `htmlpage` call from the plugins. I can't actually
 > try it: "failed writing to dst/ts.png.ikiwiki-new: Inappropriate ioctl for device".

+
+>> Crazy perl bug that ioctl thing. Worked around now in svn. --[[Joey]]
+

 > After this probable fix, in fact, all uses of htmlpage in the plugins are used to
 > construct an absolute address: the absolute url in most cases, so an `absurl`
 > call could be added to be used instead of htmlpage, and something else in the
 > After this probable fix, in fact, all uses of htmlpage in the plugins are used to
 > construct an absolute address: the absolute url in most cases, so an `absurl`
 > call could be added to be used instead of htmlpage, and something else in the