Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
filters/ccsflat2cibprelude[samba]: fix pseudo-conversion
...by removing extraneous xsl:attribute closing tag, adding missing
closing brace in test expression of xsl:when, and reindenting the whole
XLS snippet.

(FWIW, previously wasn't the branching based on system/distro working
correctly, until recent commit:
filter: inject virtual "just merge, preserve-rest" abs. parent)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1208128
Reported-by: Patrik Hagara <phagara@redhat.com>
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
  • Loading branch information
jnpkrn committed Apr 2, 2015
1 parent b72ebec commit 6b6a829
Showing 1 changed file with 25 additions and 26 deletions.
51 changes: 25 additions & 26 deletions filters/cluster/rm/samba/__init__.py
Expand Up @@ -11,36 +11,35 @@
native initscript/systemd unitfile ~ samba
-->
<xsl:when test="name() = 'samba'">
<xsl:choose>
<!-- NOTE we rely on atmost single dot separator
in the version, hence conformity with IEEE 754 -->
<xsl:when test="$system = 'linux' and (
$system_1 = 'redhat' and $system_2 &gt;= 7
or
$system_1 = 'fedora' and $system_2 &gt;= 15
)">
<xsl:choose>
<!-- NOTE we rely on atmost single dot separator
in the version, hence conformity with IEEE 754 -->
<xsl:when test="$system = 'linux' and (
$system_1 = 'redhat' and $system_2 &gt;= 7
or
$system_1 = 'fedora' and $system_2 &gt;= 15
)">
''' + (
ResourceSpec('systemd:smb').xsl_attrs
ResourceSpec('systemd:smb').xsl_attrs
) + '''
</xsl:when>
<xsl:when test="$system = 'linux' and (
$system_1 = 'redhat' and $system_2 &lt; 7
or
$system_1 = 'fedora' and $system_2 &lt; 15
">
<!-- XXX could be either lsb, service or upstart
(as far as RHEL 6 is concerned),
service seems to be most canonical, though -->
</xsl:when>
<xsl:when test="$system = 'linux' and (
$system_1 = 'redhat' and $system_2 &lt; 7
or
$system_1 = 'fedora' and $system_2 &lt; 15
)">
<!-- XXX could be either lsb, service or upstart
(as far as RHEL 6 is concerned),
service seems to be most canonical, though -->
''' + (
ResourceSpec('service:smb').xsl_attrs
ResourceSpec('service:smb').xsl_attrs
) + '''
</xsl:when>
<xsl:otherwise>
<xsl:message terminate="true"
>Knowledge of how to start samba on your system missing</xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:message terminate="true"
>Knowledge of how to start samba on your system missing</xsl:message>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
'''

Expand Down

0 comments on commit 6b6a829

Please sign in to comment.