The following commit has been merged in the master branch:
commit 6b5c4f96c0b1f1df0d4de71b13cf1a201fb52331
Author: Guillem Jover <[email protected]>
Date: Sat Jan 30 02:17:22 2010 +0100
libdpkg-perl: Make comp_prog and decomp_prog %COMP properties arrays
This will allow storing arguments alongside the command names
themselves.
diff --git a/scripts/Dpkg/Compression.pm b/scripts/Dpkg/Compression.pm
index ce21c00..c18b01d 100644
--- a/scripts/Dpkg/Compression.pm
+++ b/scripts/Dpkg/Compression.pm
@@ -50,23 +50,23 @@ interact with the set of supported compression methods.
my $COMP = {
"gzip" => {
"file_ext" => "gz",
- "comp_prog" => "gzip",
- "decomp_prog" => "gunzip",
+ "comp_prog" => [ "gzip" ],
+ "decomp_prog" => [ "gunzip" ],
},
"bzip2" => {
"file_ext" => "bz2",
- "comp_prog" => "bzip2",
- "decomp_prog" => "bunzip2",
+ "comp_prog" => [ "bzip2" ],
+ "decomp_prog" => [ "bunzip2" ],
},
"lzma" => {
"file_ext" => "lzma",
- "comp_prog" => "lzma",
- "decomp_prog" => "unlzma",
+ "comp_prog" => [ "lzma" ],
+ "decomp_prog" => [ "unlzma" ],
},
"xz" => {
"file_ext" => "xz",
- "comp_prog" => "xz",
- "decomp_prog" => "unxz",
+ "comp_prog" => [ "xz" ],
+ "decomp_prog" => [ "unxz" ],
},
};
diff --git a/scripts/Dpkg/Compression/Process.pm
b/scripts/Dpkg/Compression/Process.pm
index 538490d..c91a236 100644
--- a/scripts/Dpkg/Compression/Process.pm
+++ b/scripts/Dpkg/Compression/Process.pm
@@ -101,7 +101,7 @@ and its standard output.
sub get_compress_cmdline {
my ($self) = @_;
- my @prog = (compression_get_property($self->{"compression"}, "comp_prog"));
+ my @prog = (@{compression_get_property($self->{"compression"},
"comp_prog")});
my $level = "-" . $self->{"compression_level"};
$level = "--" . $self->{"compression_level"}
if $self->{"compression_level"} !~ m/^[1-9]$/;
@@ -111,7 +111,7 @@ sub get_compress_cmdline {
sub get_uncompress_cmdline {
my ($self) = @_;
- return (compression_get_property($self->{"compression"}, "decomp_prog"));
+ return (@{compression_get_property($self->{"compression"},
"decomp_prog")});
}
sub _sanity_check {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
