* Gerfried Fuchs <rho...@deb.at> [2013-10-25 14:24:41 +0200]: > I wouldn't move the definition my "my $bpo_url" from the other URL > definitions. Reason being, the special casing for squeeze-backports > will eventually fade and can get removed, and the URL definitions should > stick together. There's a reason why they are next to each other right > now. :) > > Maybe also put my $archive next to it and put an additional comment > that the special casing can get removed after squeeze gets archived.
That totally makes sense. Please find attached the v2 of this patch. Thanks for the feedback, -- Nicolas Dandrimont "Are [Linux users] lemmings collectively jumping off of the cliff of reliable, well-engineered commercial software?" (By Matt Welsh)
Index: data/ddpo/extract_incoming.pl =================================================================== --- data/ddpo/extract_incoming.pl (révision 3079) +++ data/ddpo/extract_incoming.pl (copie de travail) @@ -65,7 +65,8 @@ my $delayed_summary = "http://people.debian.org/~myon/delayed/delayed-summary"; my $delayed_http = "http://people.debian.org/~djpig/delayed/"; my $queue_summary = "http://ftp-master.debian.org/new.822"; -my $bpo_url = "http://backports.debian.org/debian-backports"; +my $bpo_archive = "ftp.debian.org"; +my $bpo_url = "http://ftp.debian.org/debian"; # global variables my %db; @@ -239,8 +240,15 @@ next if ($distkey =~ /^(unstable|testing)/); my $dist = $active_dists{$distkey} . "-backports"; my $codename = $distkey eq "stable" ? "bpo" : "$distkey-bpo"; + + # Special-casing for squeeze-bpo, to be removed when squeeze gets archived. + if ($dist eq "squeeze-backports") { + $bpo_archive = "backports.org"; + $bpo_url = "http://backports.debian.org/debian-backports"; + } + my $files_to_zcat = ''; - foreach my $file_to_zcat ( glob "/srv/qa.debian.org/data/ftp/backports.org/dists/$dist*/{main,contrib,non-free}/source/Sources.gz" ) + foreach my $file_to_zcat ( glob "/srv/qa.debian.org/data/ftp/$bpo_archive/dists/$dist*/{main,contrib,non-free}/source/Sources.gz" ) { $files_to_zcat .= " $file_to_zcat" if( -e $file_to_zcat ); }
signature.asc
Description: Digital signature