diff --git a/lib/release.tmpl b/lib/release.tmpl index c591e617ec42921fc3dacfd1c48f4f49bc3a6cfe_bGliL3JlbGVhc2UudG1wbA==..5f6f288d2562598e95325fbdaf873315d624de65_bGliL3JlbGVhc2UudG1wbA== 100644 --- a/lib/release.tmpl +++ b/lib/release.tmpl @@ -50,9 +50,14 @@ END; %] +[% BLOCK direct_download_file; + "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$smversion/$path"; + END; +%] + [% BLOCK download_file; # vars that need to be set by caller or document: # smversion: version number (2.0a1, 2.0.1, ...) # mirrorred: bool that tells us if to use release mirrors/bouncer, false means direct FTP # path: path to add to the base URL of that version @@ -53,9 +58,9 @@ [% BLOCK download_file; # vars that need to be set by caller or document: # smversion: version number (2.0a1, 2.0.1, ...) # mirrorred: bool that tells us if to use release mirrors/bouncer, false means direct FTP # path: path to add to the base URL of that version - IF mirrorred; + IF mirrorred AND NOT smversion.match('a|b'); "http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$smversion/$path"; ELSE; @@ -60,6 +65,6 @@ "http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$smversion/$path"; ELSE; - "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$smversion/$path"; + INCLUDE direct_download_file; END; END; %] @@ -63,9 +68,3 @@ END; END; %] - -[% BLOCK direct_download_file; - # like download_file, but unmirrorred - "ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$smversion/$path"; - END; -%] diff --git a/src/releases/2.3b3.en.html b/src/releases/2.3b3.en.html index c591e617ec42921fc3dacfd1c48f4f49bc3a6cfe_c3JjL3JlbGVhc2VzLzIuM2IzLmVuLmh0bWw=..5f6f288d2562598e95325fbdaf873315d624de65_c3JjL3JlbGVhc2VzLzIuM2IzLmVuLmh0bWw= 100755 --- a/src/releases/2.3b3.en.html +++ b/src/releases/2.3b3.en.html @@ -1,7 +1,7 @@ [%- PROCESS release.tmpl -%] [%- smversion = '2.3b3' -%] [%- prettyversion = '2.3 Beta 3' -%] -[%- mirrorred = false -%] +[%- mirrorred = true -%] [%- uselongversion = false -%] <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html lang="en">