urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix strange stderr-hiding code in the git module, allow error messages 

to be passed on to stderr. Also fixes a potential bug, since git error
  meesages were treated as if they came from git stdout.
master
joey 2007-10-10 23:27:11 +00:00
parent 65d56aa012
commit eec289e281
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Rcs/git.pm
View File

@ -23,8 +23,6 @@ sub _safe_git (&@) { #{{{
if (!$pid) {
# In child.
open STDERR, ">&STDOUT"
or error("Cannot dup STDOUT: $!");
# Git commands want to be in wc.
chdir $config{srcdir}
or error("Cannot chdir to $config{srcdir}: $!");
@ -40,7 +38,7 @@ sub _safe_git (&@) { #{{{
close $OUT;
($error_handler || sub { })->("'@cmdline' failed: $!") if $?;
$error_handler->("'@cmdline' failed: $!") if $? && $error_handler;
return wantarray ? @lines : ($? == 0);
}

5
debian/changelog vendored
View File

@ -11,8 +11,11 @@ ikiwiki (2.10) UNRELEASED; urgency=low
it, and then the failing cgi choked on the new file when _it_ tried to
render it. Ensuring that the index file is loaded after taking the lock
will avoid this bug.
* Fix strange stderr-hiding code in the git module, allow error messages
to be passed on to stderr. Also fixes a potential bug, since git error
meesages were treated as if they came from git stdout.
-- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2007 14:36:38 -0400
-- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2007 19:23:40 -0400
ikiwiki (2.9) unstable; urgency=low