remove unsued origins - upstream is no longer in the masterlist, because it is mostly incorrect

CVS version numbers

english/mirror/mirror_list.pl: 1.167 -> 1.168

1 files changed, 0 insertions, 138 deletions

diff --git a/english/mirror/mirror_list.pl b/english/mirror/mirror_list.pl
index 6384cd7a5e7..68dbfc44c4c 100755
--- a/english/mirror/mirror_list.pl
+++ b/english/mirror/mirror_list.pl
@@ -1117,142 +1117,6 @@ sub generate_html_matrix {
   print "</tbody>\n</table>\n";
 }
 
-sub mirror_tree_by_origin {
-  my %origins;
-  foreach my $country (sort keys %countries) {
-    foreach my $id (sort @{ $countries{$country} }) {
-#      if ($mirror[$id]{site} =~ /$officialsiteregex/) {
-      if (exists $mirror[$id]{method}{'archive-http'} or exists $mirror[$id]{method}{'archive-ftp'}) {
-        my $tfm = $mirror[$id]{method}{'archive-http'} || $mirror[$id]{method}{'archive-ftp'};
-        my $tf = "http://" . $mirror[$id]{site} . $tfm . "project/trace/";
-        my $mf;
-        if (exists $mirror[$id]{includes}) {
-          my $numsubsites = @{ $mirror[$id]{includes} };
-          my $snum = 0;
-          foreach my $subsite (@{ $mirror[$id]{includes} }) {
-            $tf = "http://" . $subsite . $mirror[$id]{method}{'archive-http'} . "project/trace/";
-            $mf = exists $mirror[$id]{'archive-upstream'} ? $mirror[$id]{'archive-upstream'} : "ftp-master.debian.org";
-            my @mfs = split(',\s*', $mf);
-            foreach my $mfss (@mfs) {
-              $origins{$mfss}{$subsite} = $tf;
-            }
-          }
-        } else {
-          my $mfdefault = $mirror[$id]{site} =~ /$officialsiteregex/ ? "ftp-master.debian.org" : "unknown-origin";
-          $mf = exists $mirror[$id]{'archive-upstream'} ? $mirror[$id]{'archive-upstream'} : $mfdefault;
-          my @mfs = split(',\s*', $mf);
-          foreach my $mfss (@mfs) {
-            $origins{$mfss}{ $mirror[$id]{site} } = $tf;
-          }
-        }
-      }
-    }
-  }
-
-  $origins{ 'ftp-master.debian.org' }{ 'syncproxy.eu.debian.org' } = 1;
-  $origins{ 'ftp-master.debian.org' }{ 'syncproxy.wna.debian.org' } = 1;
-
-  print "<h2>Mirrors sorted by origin</h2>\n";
-  print "<ul>\n";
-  print "<li>ftp-master.debian.org</li>";
-
-  sub crawl_origins($%) {
-    my $top = shift;
-    my %origins = shift;
-#      print "<pre>";
-#      use Data::Dumper;
-#      print Dumper(%origins);
-#      print "</pre>";
-    print "<ul>\n";
-    my @tocheck = ();
-    foreach my $o (keys %origins) {
-      if ($o ne $top) {
-        push @tocheck, $o;
-      } else {
-        
-      }
-    }
-    my $o; # FIXME
-      if ($o ne $top) {
-        print "<p>recursing with $o, " . join(",", keys %{$origins{$o}}) . "\n";
-#        crawl_origins($o, keys %{$origins{$o}}) unless ($o eq $top);
-      } else {
-        foreach my $oo (keys %{$origins{$o}}) {
-          print "<li>$oo";
-          print " (<a href=\"$origins{$o}{$oo}\">p/t</a>)"
-        }
-      }
-    print "</ul>\n";
-  }
-
-  crawl_origins('ftp-master.debian.org', %origins);
-
-if (0) {
-  print "<ul>\n";
-  print "<li>syncproxy.eu.debian.org</li>";
-  print "<ul>\n";
-  foreach my $o (keys %{$origins{'syncproxy.eu.debian.org'}}) {
-    print "<li>$o";
-    print " (<a href=\"". $origins{'syncproxy.eu.debian.org'}{$o} ."\">p/t</a>)";
-    print "<ul>\n";
-    foreach my $oo (keys %{$origins{$o}}) {
-      print "<li>$oo";
-      print " (<a href=\"$origins{$o}{$oo}\">p/t</a>)";
-      delete $origins{$o}{$oo};
-    }
-    print "</ul>\n";
-    delete $origins{'syncproxy.eu.debian.org'}{$o};
-  }
-  print "</ul>\n";
-  print "<li>syncproxy.wna.debian.org</li>";
-  print "<ul>\n";
-  foreach my $o (keys %{$origins{'syncproxy.wna.debian.org'}}) {
-    print "<li>$o";
-    print " (<a href=\"". $origins{'syncproxy.wna.debian.org'}{$o} ."\">p/t</a>)";
-    print "<ul>\n";
-    foreach my $oo (keys %{$origins{$o}}) {
-      print "<li>$oo";
-      print " (<a href=\"$origins{$o}{$oo}\">p/t</a>)";
-      delete $origins{$o}{$oo};
-    }
-    print "</ul>\n";
-    delete $origins{'syncproxy.wna.debian.org'}{$o};
-  }
-  print "</ul>\n";
-  foreach my $o (keys %{$origins{'ftp-master.debian.org'}}) {
-    next if ($o =~ /^syncproxy.(eu|wna).debian.org$/);
-    print "<li>$o";
-    print " (<a href=\"". $origins{'ftp-master.debian.org'}{$o} ."\">p/t</a>)";
-    print "<ul>\n";
-    foreach my $oo (keys %{$origins{$o}}) {
-      print "<li>$oo";
-      print " (<a href=\"$origins{$o}{$oo}\">p/t</a>)";
-      delete $origins{$o}{$oo};
-    }
-    print "</ul>\n";
-    delete $origins{'ftp-master.debian.org'}{$o};
-  }
-  print "<pre>";
-  use Data::Dumper;
-  print Dumper(%origins);
-  print "</pre>";
-  print "<li>unknown-origin</li>";
-  foreach my $o (keys %origins) {
-    print "<ul>\n";
-    foreach my $oo (keys %{$origins{$o}}) {
-      print "<li>$oo";
-      print " (<a href=\"$origins{$o}{$oo}\">p/t</a>)"
-    }
-    print "</ul>\n";
-  }
-  print "<ul>\n";
-  print "</ul>\n";
-  print "</ul>\n";
-
-} # if (0)
-
-}
-
 ######### Begin main routine ###########################
 
 if (defined $help) {
@@ -1394,8 +1258,6 @@ if ($output_type eq 'html') {
   cdimage_mirrors("httpftp");
 } elsif ($output_type eq 'cdimages-rsync') {
   cdimage_mirrors("rsync");
-} elsif ($output_type eq 'origins') {
-  mirror_tree_by_origin();
 } else {
   die "Error: unknown output type requested, $output_type\n";
 }