diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-10-10 23:27:11 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-10-10 23:27:11 +0000 |
| commit | eec289e281c86fcaf290a5e22073a010d9c5a208 (patch) | |
| tree | 6fab10b0c257980be076bb99b1d34eff2a9c2206 | |
| parent | 65d56aa012d7e241140e109176783ea0d23778bd (diff) | |
| download | ikiwiki-eec289e281c86fcaf290a5e22073a010d9c5a208.tar ikiwiki-eec289e281c86fcaf290a5e22073a010d9c5a208.tar.gz | |
* 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.
| -rw-r--r-- | IkiWiki/Rcs/git.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 070bf3208..38581ba67 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -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); } diff --git a/debian/changelog b/debian/changelog index 138412216..0b3b79d3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |