summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>2012-09-28 08:26:44 +0200
committerMartin Koegler <mkoegler@auto.tuwien.ac.at>2012-09-28 08:33:01 +0200
commit2188117683cadfc1db12cc1e96f1201c2d7deb3e (patch)
tree92645e5e836e574fddc107121aa7c4ea49cc7f47
parent421ec5c4126e32fb65a5d30aaca4dc9b74ac5e07 (diff)
downloadbuild-2188117683cadfc1db12cc1e96f1201c2d7deb3e.tar.gz
build-2188117683cadfc1db12cc1e96f1201c2d7deb3e.tar.bz2
build-2188117683cadfc1db12cc1e96f1201c2d7deb3e.zip
Bug fix: Use files generated by compression converters
Compression converters put the tar.gz file under a different name causing the content listing to fail. Therefore use the generated orig.tar.gz in the output directory instead of the original file.
-rwxr-xr-xdebtransform13
1 files changed, 7 insertions, 6 deletions
diff --git a/debtransform b/debtransform
index 087f5e8..714f4f9 100755
--- a/debtransform
+++ b/debtransform
@@ -280,12 +280,6 @@ if ($tarfile =~ /\.zip/) {
system( ( "debtransformzip", "$dir/$old", "$tmptar" )) == 0 || die("cannot transform .zip to .tar.gz");
}
-my $tardir = $tarfile;
-$tardir =~ s/\.orig\.tar/\.tar/;
-$tardir =~ s/\.tar.*?$//;
-my @tarfilecontent = listtar($tarfile, 0);
-my $origtarfile = { 'name', $tarfile, 'content', \@tarfilecontent, 'version', $tags->{'VERSION'}, 'tardir', $tardir};
-
my @files;
my $v = $version;
$v =~ s/-[^-]*$//;
@@ -299,6 +293,13 @@ if( $tmptar ) {
}
push @files, addfile("$out/$ntarfile");
+my $tarpath = "$out/$ntarfile";
+my $tardir = $tarfile;
+$tardir =~ s/\.orig\.tar/\.tar/;
+$tardir =~ s/\.tar.*?$//;
+my @tarfilecontent = listtar($tarpath, 0);
+my $origtarfile = { 'name', $tarpath, 'content', \@tarfilecontent, 'version', $tags->{'VERSION'}, 'tardir', $tardir};
+
open(DIFF, '>', "$out/${name}_$version.diff") || die("$out/${name}_$version.diff: $!\n");
undef $changelog if $dir{'debian.changelog'};