diff options
Diffstat (limited to 'scripts/Dpkg/Source/Package/V3')
-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 |
3 files changed, 6 insertions, 6 deletions
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); |