Dependency on xorg7-* only on last package
Our gen-special.sh transforms a dependency on compound packages (xorg7-*) on a dependency on the list of packages. This generates a lot of trials when removing circular dependencies, because if the dependency on xorg7-* is optional, all packages in the list are tried in turn, while it is sure that anyway the dependecy must be eliminated. If the dependency is only on the last package, the circular dep is eliminated at first try.
This commit is contained in:
parent
6d9bd8e8e8
commit
5ed69f823f
1 changed files with 19 additions and 8 deletions
|
@ -170,7 +170,25 @@ EOF
|
||||||
<!-- End dependencies -->
|
<!-- End dependencies -->
|
||||||
</module>
|
</module>
|
||||||
EOF
|
EOF
|
||||||
cat >> tmpfile << EOF
|
# cat >> tmpfile << EOF
|
||||||
|
# <xsl:element name="dependency">
|
||||||
|
# <xsl:attribute name="status">
|
||||||
|
# <xsl:value-of select="\$status"/>
|
||||||
|
# </xsl:attribute>
|
||||||
|
# <xsl:attribute name="build">
|
||||||
|
# <xsl:value-of select="\$build"/>
|
||||||
|
# </xsl:attribute>
|
||||||
|
# <xsl:attribute name="name">$packname</xsl:attribute>
|
||||||
|
# <xsl:attribute name="type">ref</xsl:attribute>
|
||||||
|
# </xsl:element>
|
||||||
|
#EOF
|
||||||
|
precpack=$packname
|
||||||
|
done
|
||||||
|
cat >>$SPECIAL_FILE << EOF
|
||||||
|
</package>
|
||||||
|
</xsl:when>
|
||||||
|
EOF
|
||||||
|
cat >> tmpfile << EOF
|
||||||
<xsl:element name="dependency">
|
<xsl:element name="dependency">
|
||||||
<xsl:attribute name="status">
|
<xsl:attribute name="status">
|
||||||
<xsl:value-of select="\$status"/>
|
<xsl:value-of select="\$status"/>
|
||||||
|
@ -181,13 +199,6 @@ EOF
|
||||||
<xsl:attribute name="name">$packname</xsl:attribute>
|
<xsl:attribute name="name">$packname</xsl:attribute>
|
||||||
<xsl:attribute name="type">ref</xsl:attribute>
|
<xsl:attribute name="type">ref</xsl:attribute>
|
||||||
</xsl:element>
|
</xsl:element>
|
||||||
EOF
|
|
||||||
done
|
|
||||||
cat >>$SPECIAL_FILE << EOF
|
|
||||||
</package>
|
|
||||||
</xsl:when>
|
|
||||||
EOF
|
|
||||||
cat >> tmpfile << EOF
|
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
EOF
|
EOF
|
||||||
done
|
done
|
||||||
|
|
Reference in a new issue