comps comps-cleanup.xsl,1.10,1.11
Nicolas Mailhot (nim)
fedora-extras-commits at redhat.com
Sun Oct 8 12:43:46 UTC 2006
Author: nim
Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31978
Modified Files:
comps-cleanup.xsl
Log Message:
warn about empty groups or categories
Index: comps-cleanup.xsl
===================================================================
RCS file: /cvs/extras/comps/comps-cleanup.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- comps-cleanup.xsl 8 Oct 2006 12:26:12 -0000 1.10
+++ comps-cleanup.xsl 8 Oct 2006 12:43:46 -0000 1.11
@@ -61,23 +61,35 @@
<xsl:template match="@*">
<xsl:copy/>
</xsl:template>
-<!-- Sort groups by id -->
+<!-- Sort groups by id, and categories by display order -->
<xsl:template match="comps" priority="1">
+ <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
<xsl:copy>
<xsl:apply-templates select="group">
<xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
</xsl:apply-templates>
<xsl:apply-templates select="category">
<xsl:sort select="display_order/text()"/>
+ <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
</xsl:apply-templates>
</xsl:copy>
</xsl:template>
+<!-- Warn about empty groups -->
+ <xsl:template match="group[count(key('packages-by-group',id/text()))=0]" priority="2">
+ <xsl:message>â¹â¹â¹ Empty group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
+ <xsl:apply-templates select="." mode="normalize"/>
+ </xsl:template>
<!-- Warn about duplicate groups being merged -->
- <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="2">
+ <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="3">
<xsl:message> â¹â¹ Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
</xsl:template>
+<!-- Warn about empty categories -->
+ <xsl:template match="category[count(key('groups-by-category',id/text()))=0]" priority="2">
+ <xsl:message>â¹â¹â¹ Empty category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
+ <xsl:apply-templates select="." mode="normalize"/>
+ </xsl:template>
<!-- Warn about duplicate categories being merged -->
- <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="2">
+ <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="3">
<xsl:message> â¹â¹ Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
</xsl:template>
<!-- Sort packages within a group by class then name -->
More information about the scm-commits
mailing list