From: Alberto Di Meglio <alberto.di.meglio@cern.ch>
Date: Wed, 20 Oct 2004 20:11:44 +0000 (+0000)
Subject: Fixed uninstallation
X-Git-Tag: glite-deployment_D_20041021~2
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=927d29834e0760854cd32fe70043e1767fd9fc2a;p=jra1mw.git

Fixed uninstallation
---

diff --git a/org.glite.deployment.lb/project/lxscript-rpm.xsl b/org.glite.deployment.lb/project/lxscript-rpm.xsl
index 20c12b8..da614b2 100644
--- a/org.glite.deployment.lb/project/lxscript-rpm.xsl
+++ b/org.glite.deployment.lb/project/lxscript-rpm.xsl
@@ -159,6 +159,7 @@ exit 0
 	<xsl:template name="dependencies" match="external">
 		<xsl:param name="install"/>
 		<xsl:variable name="package"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/>.<xsl:value-of select="@arch"/>.rpm</xsl:variable>
+		<xsl:variable name="package.name"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/></xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$install = 'true'">
 wget -N --non-verbose <xsl:value-of select="$ext-repository"/><xsl:value-of select="$package"/>
@@ -168,14 +169,25 @@ then
 	echo ERROR: <xsl:value-of select="$package"/> could not be downloaded!
 	exit 1
 fi
+RPMLIST="$RPMLIST <xsl:value-of select="$package"/>"
 			</xsl:when>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="@package.name">
+RPMLIST="$RPMLIST <xsl:value-of select="@package.name"/>"
+					</xsl:when>
+					<xsl:otherwise>
+RPMLIST="$RPMLIST <xsl:value-of select="$package.name"/>"
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
 		</xsl:choose>
-RPMLIST="$RPMLIST <xsl:value-of select="$package"/>"
 	</xsl:template>
 	
 	<xsl:template name="components" match="component">
 		<xsl:param name="install"/>
 		<xsl:variable name="package"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/>.<xsl:value-of select="@arch"/>.rpm</xsl:variable>
+		<xsl:variable name="package.name"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/></xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$install='true'">
 wget -N --non-verbose <xsl:value-of select="$repository"/><xsl:value-of select="@arch"/>/RPMS/<xsl:value-of select="$package"/>
@@ -185,9 +197,19 @@ then
 	echo ERROR: <xsl:value-of select="$package"/> could not be downloaded!
 	exit 1
 fi
+RPMLIST="$RPMLIST <xsl:value-of select="$package"/>"
 			</xsl:when>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="@package.name">
+RPMLIST="$RPMLIST <xsl:value-of select="@package.name"/>"
+					</xsl:when>
+					<xsl:otherwise>
+RPMLIST="$RPMLIST <xsl:value-of select="$package.name"/>"
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
 		</xsl:choose>
-RPMLIST="$RPMLIST <xsl:value-of select="$package"/>"
 	</xsl:template>
 
 </xsl:stylesheet>