From: Brian Gernhardt <benji@silverinsanity.com>
Date: Wed, 17 Oct 2007 14:05:47 +0000 (-0400)
Subject: cvsserver: Use exit 1 instead of die when req_Root fails.
X-Git-Tag: v1.5.3.5~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2a4b5d5a0701a5f9a953883e21a6e3dc71cd5cc7;p=git.git

cvsserver: Use exit 1 instead of die when req_Root fails.

This was causing test failures because die was exiting 255.

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 13dbd27a8..0d55fec04 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -145,8 +145,10 @@ if ($state->{method} eq 'pserver') {
     }
     my $request = $1;
     $line = <STDIN>; chomp $line;
-    req_Root('root', $line) # reuse Root
-       or die "E Invalid root $line \n";
+    unless (req_Root('root', $line)) { # reuse Root
+       print "E Invalid root $line \n";
+       exit 1;
+    }
     $line = <STDIN>; chomp $line;
     unless ($line eq 'anonymous') {
        print "E Only anonymous user allowed via pserver\n";