merge 460983 520051 tag 460983 patch thanks Attached patch should do it. Not committing it as I would like another review (buxy already took a quick look at it).
Cheers, -- Raphael Geissert - Debian Developer www.debian.org - get.debian.net
Index: www/xsl/pts-issues.xsl =================================================================== --- www/xsl/pts-issues.xsl (revision 2272) +++ www/xsl/pts-issues.xsl (working copy) @@ -307,4 +307,17 @@ </xsl:if> </xsl:template> + <xsl:template name="issue-security"> + <xsl:if test="$hasother and $other/@security!='0'"> + <li>There <xsl:if test="$other/@security!='1'">are</xsl:if> + <xsl:if test="$other/@security='1'">is</xsl:if> + <a href="http://security-tracker.debian.net/tracker/source-package/{$escaped-package}"> + <xsl:value-of select="$other/@security"/> + open security issue<xsl:if test="$other/@security!='1'">s</xsl:if></a> + , please fix <xsl:if test="$other/@security!='1'">them</xsl:if> + <xsl:if test="$other/@security='1'">it</xsl:if>. + </li> + </xsl:if> + </xsl:template> + </xsl:stylesheet> Index: www/bin/other_to_xml.py =================================================================== --- www/bin/other_to_xml.py (revision 2272) +++ www/bin/other_to_xml.py (working copy) @@ -319,6 +319,11 @@ dehs[pkgname] = {} dehs[pkgname]['error'] = msg +# read list of unfixed security issues +security = {} +for pkgname, count in read_dehs(os.path.join(dir, "security_issues.txt")): + security[pkgname] = count + # read short descriptions shortdescs = read_shortdesc(os.path.join(dir, "shortdesc.txt")) @@ -573,12 +578,22 @@ else: shortdesc_sig = ''.__hash__() + # Get security issues + if security.has_key(pkg): + elt = doc.createElement('security') + root_elt.appendChild(elt) + root_elt.setAttribute('security', security[pkg]) + sec_sig = security[pkg] + else: + root_elt.setAttribute('security', '0') + sec_sig = '0' + # TODO: try to do that signature checking before the creation of XML DOM # Build the sig and check if anything changed sig = (pts.get(pkg, "0"), dc_sig, wnpp_sig, override_sig, dehs_sig, ubuntu_sig, s_rc, s_normal, s_wishlist, s_fixed, s_gift, s_help, subsig, svnbuildstat_sig, transitions_sig, lintian_sig, - shortdesc_sig, piuparts_sig, new_queue_sig, i18n_sig) + shortdesc_sig, piuparts_sig, new_queue_sig, i18n_sig, sec_sig) if sigs.has_key(pkg) and sig == sigs[pkg] and \ os.path.isfile("%s/%s/%s/other.xml" % (odir, hash, pkg)): continue Index: www/bin/update_incoming.sh =================================================================== --- www/bin/update_incoming.sh (revision 2272) +++ www/bin/update_incoming.sh (working copy) @@ -163,6 +163,10 @@ nice_wget http://dehs.alioth.debian.org/no_upstream.txt \ dehs_error.txt +# download list of security issues +nice_wget http://alioth.debian.org/~geissert/security-packages.txt \ + security_issues.txt + # download NEW queue info nice_wget http://ftp-master.debian.org/new.822 new.822