Account for sources that do not have a distribution or component (#2)

Add support for basic source repositories that do not have component or distribution sections.

1 files changed, 15 insertions, 3 deletions

diff --git a/apt-mirror b/apt-mirror
index ad8b577..ecd11f0 100755
--- a/apt-mirror
+++ b/apt-mirror
@@ -288,7 +288,7 @@ sub download_urls
 
 sub parse_config_line
 {
-    my $pattern_deb_line = qr/^[\t ]*(?<type>deb-src|deb)(?:-(?<arch>[\w\-]+))?[\t ]+(?:\[(?<options>[^\]]+)\][\t ]+)?(?<uri>[^\s]+)[\t ]+(?<components>.+)$/;
+    my $pattern_deb_line = qr/^[\t ]*(?<type>deb-src|deb)(?:-(?<arch>[\w\-]+))?[\t ]+(?:\[(?<options>[^\]]+)\][\t ]+)?(?<uri>[^\s]+)[\t ]?(?<components>.*)$/;
     my $line = $_;
     my %config;
     if ( $line =~ $pattern_deb_line ) {
@@ -452,7 +452,7 @@ foreach (@config_binaries)
             add_url_to_download( $url . $_ . "/cnf/Commands-" . $arch . ".xz" );            
         }
     }
-    else
+    elsif ($distribution)
     {
         add_url_to_download( $uri . "/$distribution/Release" );
         add_url_to_download( $uri . "/$distribution/Release.gpg" );
@@ -460,6 +460,14 @@ foreach (@config_binaries)
         add_url_to_download( $uri . "/$distribution/Packages.bz2" );
         add_url_to_download( $uri . "/$distribution/Packages.xz" );
     }
+    else
+    {
+        add_url_to_download( $uri . "/Release" );
+        add_url_to_download( $uri . "/Release.gpg" );
+        add_url_to_download( $uri . "/Packages.gz" );
+        add_url_to_download( $uri . "/Packages.bz2" );
+        add_url_to_download( $uri . "/Packages.xz" );
+    }
 }
 
 chdir get_variable("skel_path") or die("apt-mirror: can't chdir to skel");
@@ -880,10 +888,14 @@ foreach (@config_binaries)
             process_index( $uri, "/dists/$distribution/$component/binary-$arch/Packages" );
         }
     }
-    else
+    elsif ($distribution)
     {
         process_index( $uri, "/$distribution/Packages" );
     }
+    else
+    {
+        process_index( $uri, "/Packages" );
+    }
 }
 
 clear_stat_cache();