The following commit has been merged in the master branch:
commit 92078880086a8f848d032659d6c9619cb98a857f
Author: Christoph Berg <[email protected]>
Date: Tue Jul 26 11:09:22 2011 +0200
debcheckout: When retrieving the source for debian/-only repositories, move
all .dsc components to the current directory, not just .orig.tar.gz.
diff --git a/debian/changelog b/debian/changelog
index 5e31fcc..7914a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ devscripts (2.11.1) UNRELEASED; urgency=low
[ Christoph Berg ]
* dscextract: new script, extracts a single file from a Debian source
package.
+ * debcheckout: When retrieving the source for debian/-only repositories,
+ move all .dsc components to the current directory, not just .orig.tar.gz.
-- David Prévot <[email protected]> Wed, 08 Jun 2011 12:16:32 -0400
diff --git a/scripts/debcheckout.pl b/scripts/debcheckout.pl
index 99e8646..6429863 100755
--- a/scripts/debcheckout.pl
+++ b/scripts/debcheckout.pl
@@ -827,12 +827,12 @@ sub unpack_source($$$$$) {
return 0;
}
- # put orig.tar.gz in place
- my @origtgz = glob "$tmpdir/${pkg}_*.orig.tar.gz";
- if (@origtgz) {
- my $base = $origtgz[0];
+ # put source package in place
+ foreach my $sourcefile (glob "$tmpdir/${pkg}_*") {
+ next unless (-f $sourcefile); # skip directories
+ my $base = $sourcefile;
$base =~ s!.*/!!;
- rename $origtgz[0], $base or die "rename $origtgz[0] $base: $!";
+ rename $sourcefile, $base or die "rename $sourcefile $base: $!";
}
return 1 if ($unpack_source eq 'download-only' or not $debian_only);
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
