From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Tue, 4 Sep 2007 01:05:13 +0000 (+0200)
Subject: extract_files: make unpack_srcpkg more robust
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=eba34dfe6ebc08cf75e98407fd4c547de3dd2e21;p=deb%2Fpackages.git

extract_files: make unpack_srcpkg more robust

In etch dpkg-source can extract source packages to a designated
directory. Use this instead of trying to extract the directory name
from dpkg-source's output which is inheriently unreliable.
---

diff --git a/bin/extract_files b/bin/extract_files
index c129153..d6da82c 100755
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -134,26 +134,20 @@ sub add_log {
 # PACKAGE HANDLING (UNPACKING/CLEANUP)
 
 sub unpack_srcpkg {
-    my ( $dscname, $log ) = @_;
+    my ( $pkgname, $dscname, $log ) = @_;
 
     chdir( $TEMPDIR ) or do_error( "couldn't change working directory to $TEMPDIR" );
 
-    add_log( $log, "dpkg-source -sn -x $dscname"  );
+    add_log( $log, "dpkg-source -sn -x $dscname $pkgname+source"  );
 
-    my $out = qx/dpkg-source -sn -x "$dscname" 2>&1/;
-    my ($dir) = ($out =~ /(\S+)$/mo);
-
-    add_log( $log, "dpkg-source output: ", $out );
-
-#Bug#246802
-#    system("dpkg-source", "-x", $dscname ) == 0
-#	or do {
-#	    do_warning( "couldn't unpack $dscname" );
-#	    add_log( $log, "couldn't unpack $dscname" );
-#	    return;
-#	};
+    system("dpkg-source", "-sn", "-x", $dscname, "$pkgname+source" ) == 0
+	or do {
+	    do_warning( "couldn't unpack $dscname: $!" );
+	    add_log( $log, "couldn't unpack $dscname: $!" );
+	    return;
+	};
 
-    return $dir;
+    return "$pkgname+source";
 }
 
 sub unpack_binpkg {
@@ -409,7 +403,7 @@ sub extract_files {
 	return;
     }
 
-    if (my $source_dir = unpack_srcpkg( $pkg_data->{dsc}, \$log )) {
+    if (my $source_dir = unpack_srcpkg( $pkg_data->{src_name}, $pkg_data->{dsc}, \$log )) {
 
 	$source_dir = "$TEMPDIR/$source_dir";