[Dehs-devel] SVN devscripts commit: r386 - in trunk: . debian

[Julian Gilbey]

Author: jdg
Date: 2006-04-07 00:39:46 +0000 (Fri, 07 Apr 2006)
New Revision: 386

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
Simplify uscan pipe stuff and update changelog for previous commit

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-07 00:38:23 UTC (rev 385)
+++ trunk/debian/changelog	2006-04-07 00:39:46 UTC (rev 386)
@@ -1,5 +1,7 @@
 devscripts (2.9.17) UNRELEASED; urgency=low
 
+  * several Perl scripts: make sure we set the SIGPIPE handler before
+    doing an open '-|'
   * bts: actually support the --sendmail option rather than just say we
     do!
   * bts: fix URI in manpage (Closes: #360783)
@@ -25,7 +27,7 @@
   * who-uploads: new script to determine most recent uploaders of a
     package to the Debian archive (Closes: #347809)
 
- -- Julian Gilbey <jdg at debian.org>  Thu,  6 Apr 2006 12:39:09 +0100
+ -- Julian Gilbey <jdg at debian.org>  Fri,  7 Apr 2006 01:39:15 +0100
 
 devscripts (2.9.16) unstable; urgency=low
 

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-04-07 00:38:23 UTC (rev 385)
+++ trunk/uscan.pl	2006-04-07 00:39:46 UTC (rev 386)
@@ -388,20 +388,14 @@
 # correctly, which makes this code a little messier than it would be
 # otherwise.
 my @dirs;
-my $pid = open FIND, '-|';
-if (! defined $pid) {
-    die "$progname: couldn't fork: $!\n";
+open FIND, '-|', 'find', @ARGV, qw(-follow -type d -name debian -print)
+    or die "$progname: couldn't exec find: $!\n";
+
+while (<FIND>) {
+    chomp;
+    push @dirs, $_;
 }
-if ($pid) {
-    while (<FIND>) {
-	chomp;
-	push @dirs, $_;
-    }
-    close FIND;
-} else {
-    exec 'find', @ARGV, qw(-follow -type d -name debian -print);
-    die "$progname: couldn't exec find: $!\n";
-}
+close FIND;
 
 die "$progname: No debian directories found\n" unless @dirs;