diff options
| -rwxr-xr-x | apt-mirror | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -478,7 +478,7 @@ sub find_metadata_in_release my ( $release_uri, $release_path, $line ) = ''; my $component_regex = undef; my $arch_regex = "(?:${arch}|all)"; - my $compressed_extension_regex = '(?:\.(?:gz|bz2|xz))?$'; + my $compressed_extension_regex = '(?:\.(?:gz|bz2|xz|lzma))$'; my $dist_uri; if (@components) @@ -543,11 +543,11 @@ sub find_metadata_in_release ) or ( $filename =~ m{^${component_regex}/cnf/Commands-${arch_regex}${compressed_extension_regex}$} ) or ( - $filename =~ m{^${component_regex}/dep11/Components-${arch_regex}} + $filename =~ m{^${component_regex}/dep11/Components-${arch_regex}.*${compressed_extension_regex}} ) or ( - $filename =~ m{^${component_regex}/dep11/icons-} + $filename =~ m{^${component_regex}/dep11/icons-.*${compressed_extension_regex}} ) or ( - $filename =~ m{^${component_regex}/i18n/Translation-} + $filename =~ m{^${component_regex}/i18n/Translation-.*${compressed_extension_regex}} ) ) { @@ -738,6 +738,10 @@ sub process_index { system("xz -d < $path/$index.xz > $path/$index"); } + elsif (-e "$path/$index.lzma" ) + { + system("xz -d < $path/$index.xz > $path/$index"); + } elsif (-e "$path/$index.bz2" ) { system("bzip2 -d < $path/$index.bz2 > $path/$index"); @@ -894,9 +898,6 @@ foreach (@index_urls) { die("apt-mirror: invalid url in index_urls") unless s[^(\w+)://][]; copy_file( get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_") ); - copy_file( get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_") ) if (s/\.gz$//); - copy_file( get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_") ) if (s/\.bz2$//); - copy_file( get_variable("skel_path") . "/" . sanitise_uri("$_"), get_variable("mirror_path") . "/" . sanitise_uri("$_") ) if (s/\.xz$//); } ###################################################################################### |