From 6d9ed6e41104ae5b19ef59a08b0076dd365aa33c Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 23 Apr 2013 15:56:26 -0400
Subject: [PATCH] Add some env bits to comps-cleanup.xsl

---
 comps-cleanup.xsl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/comps-cleanup.xsl b/comps-cleanup.xsl
index f4b9074e..d0dc5bc6 100644
--- a/comps-cleanup.xsl
+++ b/comps-cleanup.xsl
@@ -17,6 +17,7 @@
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="comps.dtd" doctype-public="-//Red Hat, Inc.//DTD Comps info//EN"/>
   <xsl:key name="unique-groups" match="/comps/group" use="id/text()"/>
+  <xsl:key name="unique-environments" match="/comps/environment" use="id/text()"/>
   <xsl:key name="unique-categories" match="/comps/category" use="id/text()"/>
   <xsl:key name="packages-by-group" match="/comps/group/packagelist/packagereq" use="../../id/text()"/>
   <xsl:key name="unique-package-entries" match="/comps/group/packagelist/packagereq" use="concat(../../id/text(),'/',text())"/>
@@ -71,6 +72,10 @@
       <xsl:apply-templates select="group">
         <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
+      <xsl:apply-templates select="environment">
+        <xsl:sort select="display_order/text()"/>
+        <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)"/>
@@ -118,6 +123,10 @@
     <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 environments being merged -->
+  <xsl:template match="environment[generate-id(.) != generate-id(key('unique-environments',id/text())[1])]" priority="3">
+    <xsl:message> ☹☹ Duplicate environment <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
+  </xsl:template>
   <!-- Warn about duplicate categories being merged -->
   <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>