Move handling of default compression method/level to Dpkg::Compression

Dpkg::Compression now provides new functions to get/set the default
compression method and the default compression level. There was no
good reason to have it in Dpkg::Compression::Compressor in the first
place.

Factorize some code to verify validity of what should be a compression
level in new function compression_is_valid_level($level).

dpkg-source has been updated to cope with the changes.

1 files changed, 3 insertions, 21 deletions

diff --git a/scripts/Dpkg/Compression/Compressor.pm b/scripts/Dpkg/Compression/Compressor.pm
index 4da35a129..cec3577cf 100644
--- a/scripts/Dpkg/Compression/Compressor.pm
+++ b/scripts/Dpkg/Compression/Compressor.pm
@@ -25,33 +25,15 @@ use Dpkg::ErrorHandling;
 
 use POSIX;
 
-our $default_compression = "gzip";
-our $default_compression_level = 9;
-
-# Class methods
-sub set_default_compression {
-    my ($self, $method) = @_;
-    error(_g("%s is not a supported compression"), $method)
-	    unless compression_is_supported($method);
-    $default_compression = $method;
-}
-
-sub set_default_compression_level {
-    my ($self, $level) = @_;
-    error(_g("%s is not a compression level"), $level)
-	    unless $level =~ /^([1-9]|fast|best)$/;
-    $default_compression_level = $level;
-}
-
 # Object methods
 sub new {
     my ($this, %args) = @_;
     my $class = ref($this) || $this;
     my $self = {};
     bless $self, $class;
-    $self->set_compression($args{"compression"} || $default_compression);
+    $self->set_compression($args{"compression"} || compression_get_default());
     $self->set_compression_level($args{"compression_level"} ||
-	    $default_compression_level);
+	    compression_get_default_level());
     return $self;
 }
 
@@ -65,7 +47,7 @@ sub set_compression {
 sub set_compression_level {
     my ($self, $level) = @_;
     error(_g("%s is not a compression level"), $level)
-	    unless $level =~ /^([1-9]|fast|best)$/;
+	    unless compression_is_valid_level($level);
     $self->{"compression_level"} = $level;
 }