[jhalfs] branch trunk updated: Prevent adding "|| true" to <literal> "strip"

This is a multi-part message in MIME format...

------------=_1772190489-1253-10877
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.

The following commit(s) were added to refs/heads/trunk by this push:
     new df1d0e7  Prevent adding "|| true" to <literal> "strip"
df1d0e7 is described below

commit df1d0e71953ae1a0b12723d15380ebfe59f0dec3
Author: Pierre Labastie <[email protected]>
AuthorDate: Fri Feb 27 12:02:20 2026 +0100

    Prevent adding "|| true" to <literal> "strip"
    
    Because sometimes, stripping command may fail, we add "||true"
    to them, but this is wrong if the "strip" command is in a
    <literal> tag. Specifically, for multilib meson, the breakage
    was reported by "Moody" on discord.
    So don't add  anything in <literal> tags.
---
 LFS/lfs.xsl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 905149e..d94a79f 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -459,8 +459,9 @@ exit 124; }&#xA;</xsl:text>
      file removal (and possibly other clean up). We therefore call a template
      to comment them out appropriately and also to not stop if stripping
      fails. -->
-      <xsl:when test="contains(string(),'strip ') or
-                      contains(string(),'\*.la')">
+      <xsl:when test="not(./literal) and
+                      (contains(string(),'strip ') or
+                      contains(string(),'\*.la'))">
         <xsl:call-template name="comment-strip">
           <xsl:with-param name="instructions" select="string()"/>
         </xsl:call-template>

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

------------=_1772190489-1253-10877
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
------------=_1772190489-1253-10877--