diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | IkiWiki/Plugin/hnb.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | t/bazaar.t | 7 | ||||
| -rwxr-xr-x | t/cvs.t | 7 | ||||
| -rwxr-xr-x | t/git.t | 7 | ||||
| -rwxr-xr-x | t/mercurial.t | 7 | ||||
| -rwxr-xr-x | t/svn.t | 7 |
8 files changed, 30 insertions, 12 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..5d425843f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm index 32c9cf3ad..5157a6b93 100644 --- a/IkiWiki/Plugin/hnb.pm +++ b/IkiWiki/Plugin/hnb.pm @@ -33,8 +33,8 @@ sub htmlize (@) { # hnb outputs version number etc. every time to STDOUT, so # using files makes it easier to seprarate. - my $tmpin = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX" ); - my $tmpout = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" ); + my ($infh, $tmpin) = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX" ); + my ($outfh, $tmpout) = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" ); open(TMP, '>', $tmpin) or die "Can't write to $tmpin: $!"; print TMP $params{content}; diff --git a/debian/changelog b/debian/changelog index ae1d23479..15ae21a55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low * Fixed some confusion and bugginess about whether rcs_getctime/rcs_getmtime were passed absolute or relative filenames. (Make it relative like everything else.) + * hnb: Fixed broken use of mkstemp that had caused dangling temp files, + and prevented actually rendering hnb files. -- Joey Hess <joeyh@debian.org> Wed, 23 Jun 2010 15:30:04 -0400 diff --git a/t/bazaar.t b/t/bazaar.t index 3e54ec4dc..cd840fbe1 100755 --- a/t/bazaar.t +++ b/t/bazaar.t @@ -6,11 +6,14 @@ BEGIN { $dir = "/tmp/ikiwiki-test-bzr.$$"; my $bzr=`which bzr`; chomp $bzr; - if (! -x $bzr || ! mkdir($dir)) { + if (! -x $bzr) { eval q{ - use Test::More skip_all => "bzr not available or could not make test dir" + use Test::More skip_all => "bzr not available" } } + if (! mkdir($dir)) { + die $@; + } } use Test::More tests => 17; @@ -8,11 +8,14 @@ BEGIN { chomp $cvs; my $cvsps=`which cvsps`; chomp $cvsps; - if (! -x $cvs || ! -x $cvsps || ! mkdir($dir)) { + if (! -x $cvs || ! -x $cvsps) { eval q{ - use Test::More skip_all => "cvs or cvsps not available or could not make test dir" + use Test::More skip_all => "cvs or cvsps not available" } } + if (! mkdir($dir)) { + die $@; + } foreach my $module ('File::ReadBackwards', 'File::MimeInfo') { eval qq{use $module}; if ($@) { @@ -7,11 +7,14 @@ BEGIN { $dir="/tmp/ikiwiki-test-git.$$"; my $git=`which git`; chomp $git; - if (! -x $git || ! mkdir($dir)) { + if (! -x $git) { eval q{ - use Test::More skip_all => "git not available or could not make test dir" + use Test::More skip_all => "git not available" } } + if (! mkdir($dir)) { + die $@; + } } use Test::More tests => 18; diff --git a/t/mercurial.t b/t/mercurial.t index b64ea8e56..4918fc76e 100755 --- a/t/mercurial.t +++ b/t/mercurial.t @@ -6,11 +6,14 @@ BEGIN { $dir = "/tmp/ikiwiki-test-hg.$$"; my $hg=`which hg`; chomp $hg; - if (! -x $hg || ! mkdir($dir)) { + if (! -x $hg) { eval q{ - use Test::More skip_all => "hg not available or could not make test dir" + use Test::More skip_all => "hg not available" } } + if (! mkdir($dir)) { + die $@; + } } use Test::More tests => 11; @@ -8,11 +8,14 @@ BEGIN { chomp $svn; my $svnadmin=`which svnadmin`; chomp $svnadmin; - if (! -x $svn || ! -x $svnadmin || ! mkdir($dir)) { + if (! -x $svn || ! -x $svnadmin) { eval q{ - use Test::More skip_all => "svn not available or could not make test dir" + use Test::More skip_all => "svn or svnadmin not available" } } + if (! mkdir($dir)) { + die $@; + } } use Test::More tests => 12; |