Re: Wrong tag in template/debian/release_info.wml

Dear Baptiste and Holger,

Thanks for reporting issue and proposing patch.

At Wed, 22 Jun 2016 00:45:55 +0200,
Holger Wansing wrote:
> 
> Baptiste Jammet <[email protected]> wrote:
> > 
> > We were notified [1] of a broken link to the unofficial non-free images 
> > from the page :
> > https://www.debian.org/releases/jessie/debian-installer/
> > 
> > I think it comes from :
> > english/template/debian/release_info.wml
> > where non-free-cd-release is defined as cd-release :
> > > # non-free cd including firmware are not always in sync
> > > <define-tag 
> > > current-nonfree-cd-release-dirname><current-cd-release/></define-tag>
> > instead of being defined as 8.5.0+nonfree.
> > 
> > [1] https://lists.debian.org/debian-l10n-french/2016/06/msg00098.html
> > 
> > Thanks
> > Baptiste, not sure enough to commit a change in the templates !
> 
> The following should do the trick:
> 
> 
> 
> Index: release_info.wml
> ===================================================================
> RCS file: /cvs/webwml/webwml/english/template/debian/release_info.wml,v
> retrieving revision 1.89
> diff -u -r1.89 release_info.wml
> --- release_info.wml    5 Jun 2016 19:25:24 -0000       1.89
> +++ release_info.wml    21 Jun 2016 22:44:50 -0000
> @@ -40,7 +40,7 @@
>  # live CD are not always in sync
>  <define-tag current-live-cd-release-dirname>current</define-tag>
>  # non-free cd including firmware are not always in sync
> -<define-tag current-nonfree-cd-release-dirname><current-cd-release/></define-tag>
> +<define-tag current-nonfree-cd-release-dirname><current-cd-release/>+nonfree</define-tag>
>  <define-tag current-nonfree-cd-release-filename><current-nonfree-cd-release-dirname/></define-tag>
>  
>  <define-tag packages_in_stable>43000</define-tag>

No, the patch will cause side effect.
Because, 'current-nonfree-cd-release-filename' tag
depends on 'current-nonfree-cd-release-dirname' tag.
'current-nonfree-cd-release-filename' tag should keep as is.
(the tag should be evaluated as '8.5.0' and not be as '8.5.0+nonfree').

Another patch were committed to official repository [1].
I hope this modification will fix our issue.

[1] http://anonscm.debian.org/viewvc/webwml/webwml/english/template/debian/release_info.wml?r1=1.89&r2=1.90

Sincerely yours,
Ryuunosuke Ayanokouzi
-- 
AYANOKOUZI, Ryuunosuke <[email protected]>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAABAgAGBQJXagvpAAoJECh1UQ+VhnAQrycIAIrrWt2Z+XxT2GRgYrtGXgCZ
lYCPkK+xEL2pAf6Q3vLehVb99rFLNHNYi2OaI3FxGFkFVLrqD3bXg5mdg3uCBQsu
SXUza1Ha+/dlPgmqej9WX19saJlUkP5zr83taM51SKUL1vFrHcNgoI7VtdKr+VRS
nf0ZzqvfQ91EZBbec+MNgkD23IrPQ/kAyUjGMeSf9fcDUTQdoXyYIqs4vlcr6kbw
BDh8Jg6SH59x0J38O5Pqx8IxBMR2mD/FCqUGpgYCIEPG2RoxNIJLVwe8ZLLovjCJ
NxnniZfdIvg3ZJ8fSAeZhyOZUPPdtw5WyK2GCyu7dPEL80sQyeB3daXE6om0d7Y=
=I55U
-----END PGP SIGNATURE-----