Merge pull request #35 from chutzimir/no-debian-installer

Revert "The debian network installer needs these files too"

1 files changed, 2 insertions, 4 deletions

diff --git a/apt-mirror b/apt-mirror
index afe64e9..0c52b0b 100755
--- a/apt-mirror
+++ b/apt-mirror
@@ -566,9 +566,9 @@ sub find_metadata_in_release
                             ) or (
                                 $filename =~ m{^${component_regex}/Contents-${arch_regex}${compressed_extension_regex}}
                             ) or (
-                                $filename =~ m{^${component_regex}/(?:debian-installer/)?binary-${arch_regex}/Packages${compressed_extension_regex}}
+                                $filename =~ m{^${component_regex}/binary-${arch_regex}/Packages${compressed_extension_regex}}
                             ) or (
-                                $filename =~ m{^${component_regex}/(?:debian-installer/)?binary-${arch_regex}/Release$}
+                                $filename =~ m{^${component_regex}/binary-${arch_regex}/Release$} # Needed for netboot.
                             ) or (
                                 $filename =~ m{^${component_regex}/cnf/Commands-${arch_regex}${compressed_extension_regex}}
                             ) or (
@@ -803,8 +803,6 @@ foreach (@config_binaries)
         {
             process_index( $uri, "/dists/$distribution/$component/binary-$arch/Packages" );
             process_index( $uri, "/dists/$distribution/$component/binary-all/Packages", 1 );
-            process_index( $uri, "/dists/$distribution/$component/debian-installer/binary-$arch/Packages", 1 );
-            process_index( $uri, "/dists/$distribution/$component/debian-installer/binary-all/Packages", 1 );
         }
     }
     elsif ($distribution)