Changeset 6b5d676

Timestamp:

02/13/2021 11:20:18 AM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.1, 11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f75e8af

Parents:

f62e3c6

Message:

Try to prevent errors from jhalfs due to non existing files or already
existing files when (re)moving old/incompatible files

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@24217 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/genlib/glib2.xml (modified) (1 diff)
• gnome/platform/evolution-data-server.xml (modified) (1 diff)

general/genlib/glib2.xml

@@ -160 +160 @@
       </para>
 
-<screen><userinput remap="pre">[ -e /usr/include/glib-2.0 ] &amp;&amp; mv -vf /usr/include/glib-2.0{,.old}</userinput></screen>
+<screen role="root"><userinput remap="pre">[ -e /usr/include/glib-2.0 ]     &amp;&amp;
+rm -rf /usr/include/glib-2.0.old &amp;&amp;
+mv -vf /usr/include/glib-2.0{,.old}</userinput></screen>
 
     </warning>

gnome/platform/evolution-data-server.xml

@@ -135 +135 @@
     </para>
 
-<screen role="root"><userinput remap="pre">rm -v /usr/lib/systemd/user/evolution-*.service</userinput></screen>
+<screen role="root"
+        revision="systemd"><userinput remap="pre">rm -fv /usr/lib/systemd/user/evolution-*.service</userinput></screen>
 
     <para>