Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Aug 2009 13:35:47 +0000 (UTC)
From:      Dag-Erling Smorgrav <des@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r196697 - user/des/fmerge
Message-ID:  <200908311335.n7VDZlu6029179@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: des
Date: Mon Aug 31 13:35:47 2009
New Revision: 196697
URL: http://svn.freebsd.org/changeset/base/196697

Log:
  Remove duplicate execution and debugging printout.

Modified:
  user/des/fmerge/fmerge.pl

Modified: user/des/fmerge/fmerge.pl
==============================================================================
--- user/des/fmerge/fmerge.pl	Mon Aug 31 13:23:55 2009	(r196696)
+++ user/des/fmerge/fmerge.pl	Mon Aug 31 13:35:47 2009	(r196697)
@@ -65,8 +65,7 @@ sub svn_check($@) {
 sub svn_do(@) {
     my @argv = @_;
     info('svn', @argv);
-    system('svn', @argv)
-	unless $pretend;
+    return if $pretend;
     my $pid = fork();
     if ($pid == -1) {
 	die("fork(): $!\n");
@@ -75,7 +74,6 @@ sub svn_do(@) {
 	die("exec(): $!\n");
     }
     waitpid($pid, 0);
-    info($?);
     if ($? & 128) {
 	info("svn died with signal", $? & 128);
 	kill($? & 128, $$);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908311335.n7VDZlu6029179>