summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-20 22:19:28 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-02-20 22:19:28 +0000
commit135e5fc63a47d198e6ab6b0ebf30c87087d3f5d5 (patch)
treeff9bf6f7e4eaebb3b0399cd452e5e72a178a11c3
parent1334cc55ba522855bf5c7cd24febd70c6ac6fc23 (diff)
* perl is broken: print "" || die fails! Work around this insanity.
-rw-r--r--IkiWiki.pm4
-rw-r--r--debian/changelog3
-rw-r--r--doc/patchqueue/index.html_allowed.mdwn3
3 files changed, 8 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index bbc857214..40622a5be 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -292,7 +292,9 @@ sub writefile ($$$;$$) { #{{{
$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") ||
diff --git a/debian/changelog b/debian/changelog
index 6c0c50689..b70a7cf89 100644
--- 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.
+ * 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
diff --git a/doc/patchqueue/index.html_allowed.mdwn b/doc/patchqueue/index.html_allowed.mdwn
index 528eb7d39..2431b802a 100644
--- 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".
+
+>> 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