Bug#249805: marked as done (www.debian.org: tidy reports trimming empty <dd> for security pages)
Your message dated Sat, 22 May 2004 11:23:31 -0700
with message-id <20040522182331.GC629@catalunya>
and subject line Bug#249805: www.debian.org: tidy reports trimming empty <dd> for security pages
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 19 May 2004 10:27:23 +0000
>From nico.bertol@free.fr Wed May 19 03:27:23 2004
Return-path: <nico.bertol@free.fr>
Received: from postfix3-2.free.fr [213.228.0.169]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BQOIF-0006m4-00; Wed, 19 May 2004 03:27:23 -0700
Received: from bertol (lns-th2-4f-81-56-240-158.adsl.proxad.net [81.56.240.158])
by postfix3-2.free.fr (Postfix) with ESMTP id 62B58D142
for <submit@bugs.debian.org>; Wed, 19 May 2004 12:27:20 +0200 (CEST)
Received: from nico by bertol with local (Exim 3.35 #1 (Debian))
id 1BQOIA-0000u1-00; Wed, 19 May 2004 12:27:18 +0200
Date: Wed, 19 May 2004 12:27:18 +0200
From: Nicolas Bertolissio <nico.bertol@free.fr>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: www.debian.org: tidy reports trimming empty <dd> for security pages
Message-ID: <[🔎] 20040519102718.GD2341@free.fr>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="sXc4Kmr5FA7axrvy"
Content-Disposition: inline
X-Reportbug-Version: 2.58
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=0.5 required=4.0 tests=BAYES_20,HTML_MESSAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
--sXc4Kmr5FA7axrvy
Content-Type: multipart/mixed; boundary="t0UkRYy7tHLRMCai"
Content-Disposition: inline
--t0UkRYy7tHLRMCai
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Package: www.debian.org
Severity: normal
Tags: patch
Hi,
looking at
http://people.debian.org/~alfie/tidy/fr
tidy reports some warnings about empty <dd> tags, here is a patch that
should solve this problem for security pages. The warning appears when
<moreinfo> is empty, so I added a test on this. BTW this patch also
removes the "More info:" line if there is no more info.
It's written in perl as I'm a better at perl than at wml :)
Regards
Nicolas Bertolissio
-- System Information:
Debian Release: testing/unstable
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.4
Locale: LANG=3Dfr_FR@euro, LC_CTYPE=3Dfr_FR@euro
--=20
--t0UkRYy7tHLRMCai
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="security.wml.diff"
Index: security.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/security.wml,v
retrieving revision 1.117
diff -u -r1.117 security.wml
--- security.wml 23 Apr 2004 13:33:24 -0000 1.117
+++ security.wml 19 May 2004 10:18:21 -0000
@@ -74,8 +74,13 @@
</dd>
<dt><gettext domain="security">Security database references</gettext>:</dt>
<dd><:= security_references("<secrefs/>") :></dd>
+<perl>
+ if ("<moreinfo/>" =~ /\S/) {
+ print "
<dt><gettext domain="security">More information</gettext>:</dt>
<dd><moreinfo/></dd>
+"; }
+</perl>
#<ifneq "{#securitybody#}" "" "
<ifneq "<isvulnerable/>" "no" "
<dt><gettext domain="security">Fixed in</gettext>:</dt>
--t0UkRYy7tHLRMCai--
--sXc4Kmr5FA7axrvy
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAqzaGPnQ0OX3ZAY0RAjEsAJ47M70aEoFJ1UPAnuBuuRh3F8qgjgCgpFVO
j+NxqUJ31a8ZlPOcRcH8q48=
=FhSQ
-----END PGP SIGNATURE-----
--sXc4Kmr5FA7axrvy--
---------------------------------------
Received: (at 249805-done) by bugs.debian.org; 22 May 2004 18:22:18 +0000
>From kraai@lafn.org Sat May 22 11:22:18 2004
Return-path: <kraai@lafn.org>
Received: from zoot.lafn.org [206.117.18.6]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BRb8U-0003s3-00; Sat, 22 May 2004 11:22:18 -0700
Received: from localhost (host-66-81-16-238.rev.o1.com [66.81.16.238])
by zoot.lafn.org (8.12.3p3/8.12.3) with ESMTP id i4MIM8O1006056
(version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NO);
Sat, 22 May 2004 11:22:14 -0700 (PDT)
(envelope-from kraai@lafn.org)
Received: from kraai by localhost with local (Exim 4.32)
id 1BRb9g-0000Mp-4k; Sat, 22 May 2004 11:23:32 -0700
Date: Sat, 22 May 2004 11:23:31 -0700
From: Matt Kraai <kraai@ftbfs.org>
To: Nicolas Bertolissio <nico.bertol@free.fr>
Cc: 249805-done@bugs.debian.org
Subject: Re: Bug#249805: www.debian.org: tidy reports trimming empty <dd> for security pages
Message-ID: <20040522182331.GC629@catalunya>
References: <[🔎] 20040519102718.GD2341@free.fr> <[🔎] 20040519200926.GD485@catalunya> <[🔎] 20040520065548.GA2107@free.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <[🔎] 20040520065548.GA2107@free.fr>
User-Agent: Mutt/1.5.6i
Sender: Matt Kraai <kraai@lafn.org>
X-Virus-Scanned: clamd / ClamAV version 0.70, clamav-milter version 0.70j
Delivered-To: 249805-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
On Thu, May 20, 2004 at 08:55:48AM +0200, Nicolas Bertolissio wrote:
> Le mercredi 19 mai 2004, Matt Kraai ?crit :
> > On Wed, May 19, 2004 at 12:27:18PM +0200, Nicolas Bertolissio wrote:
> > > looking at
> > > http://people.debian.org/~alfie/tidy/fr
> > > tidy reports some warnings about empty <dd> tags, here is a patch that
> > > should solve this problem for security pages. The warning appears when
> > > <moreinfo> is empty, so I added a test on this. BTW this patch also
> > > removes the "More info:" line if there is no more info.
> > >
> > > It's written in perl as I'm a better at perl than at wml :)
> >
> > Thanks for the patch, but how about simply removing the <moreinfo>
> > tags from the offending pages?
>
> Well, I've not analysed all templates, and maybe this tag is used
> somewhere else, even if empty.
>
> Moreover, some DSA have <moreinfo>, and some don't, so we need to
> display the <moreinfo> when it is available. And, of course, we need
> some code to do so.
> This code should not be executed when the tag doesn't exist (I've not
> tried a "<dd><moreinfo/></dd>" if <moreinfo> doesn't exist, but I assume
> this issue a warning at least, or maybe prevents the page from building
> at all) and so we need to test whether the tag exists or not.
> In my patch I test whether it's empty or not, so I think we need some
> code in both case. My patch simply avoid changing all existing DSA with
> empty <moreinfo>.
It should be fixed now.
--
Matt Kraai kraai@ftbfs.org http://ftbfs.org/
Reply to: