diff options
Diffstat (limited to 'scripts/Dpkg/Source/Package')
| -rw-r--r-- | scripts/Dpkg/Source/Package/V1.pm | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V2.pm | 15 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V3/bzr.pm | 4 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V3/git.pm | 4 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V3/native.pm | 4 |
5 files changed, 15 insertions, 14 deletions
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index a7e81327d..319e9c290 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -292,7 +292,7 @@ sub do_build { my ($ntfh, $newtar) = tempfile("$tarname.new.XXXXXX", DIR => getcwd(), UNLINK => 0); my $tar = Dpkg::Source::Archive->new(filename => $newtar, - compression => get_compression_from_filename($tarname), + compression => compression_guess_from_filename($tarname), compression_level => $self->{'options'}{'comp_level'}); $tar->create(options => \@tar_ignore, 'chdir' => $tardirbase); $tar->add_directory($tardirname); diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index 2a8f7e966..bcacea887 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -89,16 +89,17 @@ sub do_extract { my $basenamerev = $self->get_basename(1); my ($tarfile, $debianfile, %origtar, %seen); + my $re_ext = $compression_re_file_ext; foreach my $file ($self->get_files()) { - (my $uncompressed = $file) =~ s/\.$comp_regex$//; + (my $uncompressed = $file) =~ s/\.$re_ext$//; error(_g("duplicate files in %s source package: %s.*"), "v2.0", $uncompressed) if $seen{$uncompressed}; $seen{$uncompressed} = 1; - if ($file =~ /^\Q$basename\E\.orig\.tar\.$comp_regex$/) { + if ($file =~ /^\Q$basename\E\.orig\.tar\.$re_ext$/) { $tarfile = $file; - } elsif ($file =~ /^\Q$basename\E\.orig-([\w-]+)\.tar\.$comp_regex$/) { + } elsif ($file =~ /^\Q$basename\E\.orig-([\w-]+)\.tar\.$re_ext$/) { $origtar{$1} = $file; - } elsif ($file =~ /^\Q$basenamerev\E\.debian\.tar\.$comp_regex$/) { + } elsif ($file =~ /^\Q$basenamerev\E\.debian\.tar\.$re_ext$/) { $debianfile = $file; } else { error(_g("unrecognized file for a %s source package: %s"), @@ -201,7 +202,7 @@ sub apply_patches { sub can_build { my ($self, $dir) = @_; foreach ($self->find_original_tarballs()) { - return 1 if /\.orig\.tar\.$comp_regex$/; + return 1 if /\.orig\.tar\.$compression_re_file_ext$/; } return (0, _g("no orig.tar file found")); } @@ -250,7 +251,7 @@ sub do_build { my ($tarfile, %origtar); my @origtarballs; foreach (sort $self->find_original_tarballs()) { - if (/\.orig\.tar\.$comp_regex$/) { + if (/\.orig\.tar\.$compression_re_file_ext$/) { if (defined($tarfile)) { error(_g("several orig.tar files found (%s and %s) but only " . "one is allowed"), $tarfile, $_); @@ -258,7 +259,7 @@ sub do_build { $tarfile = $_; push @origtarballs, $_; $self->add_file($_); - } elsif (/\.orig-([\w-]+)\.tar\.$comp_regex$/) { + } elsif (/\.orig-([\w-]+)\.tar\.$compression_re_file_ext$/) { $origtar{$1} = $_; push @origtarballs, $_; $self->add_file($_); diff --git a/scripts/Dpkg/Source/Package/V3/bzr.pm b/scripts/Dpkg/Source/Package/V3/bzr.pm index b30c17a8e..dd5d1444c 100644 --- a/scripts/Dpkg/Source/Package/V3/bzr.pm +++ b/scripts/Dpkg/Source/Package/V3/bzr.pm @@ -177,9 +177,9 @@ sub do_extract { error(_g("format v3.0 uses only one source file")); } my $tarfile = $files[0]; - if ($tarfile !~ /^\Q$basenamerev\E\.bzr\.tar\.$comp_regex$/) { + if ($tarfile !~ /^\Q$basenamerev\E\.bzr\.tar\.$compression_re_file_ext$/) { error(_g("expected %s, got %s"), - "$basenamerev.bzr.tar.$comp_regex", $tarfile); + "$basenamerev.bzr.tar.$compression_re_file_ext", $tarfile); } erasedir($newdirectory); diff --git a/scripts/Dpkg/Source/Package/V3/git.pm b/scripts/Dpkg/Source/Package/V3/git.pm index a2dd1335d..d3b72a983 100644 --- a/scripts/Dpkg/Source/Package/V3/git.pm +++ b/scripts/Dpkg/Source/Package/V3/git.pm @@ -241,9 +241,9 @@ sub do_extract { error(_g("format v3.0 uses only one source file")); } my $tarfile = $files[0]; - if ($tarfile !~ /^\Q$basenamerev\E\.git\.tar\.$comp_regex$/) { + if ($tarfile !~ /^\Q$basenamerev\E\.git\.tar\.$compression_re_file_ext$/) { error(_g("expected %s, got %s"), - "$basenamerev.git.tar.$comp_regex", $tarfile); + "$basenamerev.git.tar.$compression_re_file_ext", $tarfile); } erasedir($newdirectory); diff --git a/scripts/Dpkg/Source/Package/V3/native.pm b/scripts/Dpkg/Source/Package/V3/native.pm index a0c1b20ce..189b8d6ab 100644 --- a/scripts/Dpkg/Source/Package/V3/native.pm +++ b/scripts/Dpkg/Source/Package/V3/native.pm @@ -44,7 +44,7 @@ sub do_extract { my $tarfile; foreach my $file ($self->get_files()) { - if ($file =~ /^\Q$basenamerev\E\.tar\.$comp_regex$/) { + if ($file =~ /^\Q$basenamerev\E\.tar\.$compression_re_file_ext$/) { error(_g("multiple tarfiles in v1.0 source package")) if $tarfile; $tarfile = $file; } else { @@ -85,7 +85,7 @@ sub do_build { my ($dirname, $dirbase) = fileparse($dir); my $tar = Dpkg::Source::Archive->new(filename => $newtar, - compression => get_compression_from_filename($tarname), + compression => compression_guess_from_filename($tarname), compression_level => $self->{'options'}{'comp_level'}); $tar->create(options => \@tar_ignore, 'chdir' => $dirbase); $tar->add_directory($dirname); |