[jhalfs] 02/06: Escape single quotes in literal for porg style

"Git Owner" ([email protected] via alfs-discuss Mailing List) <[email protected]> Sat, 25 Apr 2026 16:46:48 +0000
Newsgroups gmane.linux.lfs.automated
Message-ID <[email protected]>
This is a multi-part message in MIME format...

------------=_1777135619-2136-26071
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

commit f41c08f29dd5befbaaec7f908f5927ba5ba596ea
Author: Pierre Labastie <[email protected]>
AuthorDate: Sat Apr 25 14:54:47 2026 +0200

    Escape single quotes in literal for porg style
    
    When using porg style package management, all remap=install
    instructions are wrapped into a "wrapInstall ' ... '"
    construct. If the ... contains single quotes, they must be
    changed to '\''. This was not done in <literal> tags, which
    is wrong. The multilib instructions for meson expose this
    bug. This commit should fix the issue.
---
 LFS/lfs.xsl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index d94a79f..e45fc4f 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -707,6 +707,13 @@ unset OLD_PKGDIR
           <xsl:with-param name="consolestring" select="string()"/>
         </xsl:call-template>
       </xsl:when>
+      <xsl:when test="$wrap-install='y' and ../@remap='install'">
+        <!-- We want to escape single quotes even in literal, because
+        it is wrapped into wrapInstall -->
+        <xsl:call-template name="output-wrap">
+          <xsl:with-param name="commands" select="string()"/>
+        </xsl:call-template>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:apply-templates/>
       </xsl:otherwise>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

------------=_1777135619-2136-26071
Content-Type: text/plain; charset="UTF-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page
------------=_1777135619-2136-26071--