Changeset 6c8095a for BLFS/libs/func_dependencies

Timestamp:

08/22/2017 09:00:49 AM (7 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

e674994

Parents:

ca37fee

Message:

Avoid infinite recursion in "tree-erase" if there is a circular dependency

File:

• BLFS/libs/func_dependencies (modified) (1 diff)

BLFS/libs/func_dependencies

@@ -277 +277 @@
 local file=$1
 local f
-local -a rootlink
+local rootlink
 local rootlink2
 
 #echo file=$file
-rootlink=($(head -n1 $file))
+rootlink="$(head -n1 $file) "
 for f in $(grep '[^0-9 ]' $file | sed 's/.* //'); do
-#  echo "    f"=$f
   if [ -f ${f}.dep ]; then
     rootlink2="$(head -n1 ${f}.dep) "
+# We want two things:
+# i)  do not erase the file if it is in another branch
+# ii) do not erase the file if there is a circular dependency
+# for case i), we test that rootlink is contained in rootlink2
+# for case ii), we test that rootlink2 is not contained in
+# rootlink.
 # See comment above about srootlink
-    if [[ ${rootlink2#"${rootlink[*]} "} != ${rootlink2} ]] ; then
+    if [[ ${rootlink2#${rootlink}} != ${rootlink2} &&
+          ${rootlink#${rootlink2}} == ${rootlink} ]] ; then
       tree_erase ${f}.dep
     fi