diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2016-01-21 18:12:41 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2016-02-01 23:53:32 +0100 |
| commit | d8da677b0f248c93d4c4d1bc463e851f7dc1a29f (patch) | |
| tree | 89fa889671e81fb822221a9203bfbadd4f8c9342 | |
| parent | ad6a34671e1e3bb2ac2f9ea1d18792358da20fd1 (diff) | |
| download | clufter-d8da677b0f248c93d4c4d1bc463e851f7dc1a29f.tar.gz clufter-d8da677b0f248c93d4c4d1bc463e851f7dc1a29f.tar.xz clufter-d8da677b0f248c93d4c4d1bc463e851f7dc1a29f.zip | |
filters/cibcompact2cib[resources]: refer to reliable id-prefix
Resolves: rhbz#1300050
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | filters/cib/configuration/resources/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/filters/cib/configuration/resources/__init__.py b/filters/cib/configuration/resources/__init__.py index 91149a9..ee8e94f 100644 --- a/filters/cib/configuration/resources/__init__.py +++ b/filters/cib/configuration/resources/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2015 Red Hat, Inc. +# Copyright 2016 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" @@ -601,6 +601,8 @@ cibcompact2cib = ('''\ <xsl:template match="primitive[ meta_attributes/nvpair/@name = 'rgmanager-monitor' ]"> + <xsl:variable name="ResPrefix" + select="@id"/> <xsl:variable name="Monitor" select="meta_attributes/nvpair[ @name = 'rgmanager-monitor' @@ -624,7 +626,7 @@ cibcompact2cib = ('''\ <xsl:when test="name() = 'operations'"> <xsl:copy> <xsl:apply-templates select="@*|*"/> - <op id="{concat(@id, '-OP-monitor')}" + <op id="{concat($ResPrefix, '-OP-monitor')}" name="monitor" interval="{$Monitor/@value}"/> </xsl:copy> |