Changeset 0722dde

Timestamp:

06/04/2021 07:13:04 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

106157fd

Parents:

cfdb089

Message:

Do not use global $version when writing Makefile

In func_wrt_makefile, the two functions LUSER_wrt_unpack and
CHROOT_Unpack use the version variable without setting it.
This leads to the global version variable being used, which
writes garbage into the Makefile. Fix: just define version locally.

This bug does not occur often because those functions are only
used when using custom scripts for versioned packages (if building LFS).
It has been found by William Harrington.

File:

• common/libs/func_wrt_Makefile (modified) (2 diffs)

common/libs/func_wrt_Makefile

@@ -215 +215 @@
 LUSER_wrt_unpack() {               # Unpack and set 'ROOT' var
 #----------------------------------#
-  local FILE=$1
-  local optSAVE_PREVIOUS=$2
+  local FILE="$1"
+  local optSAVE_PREVIOUS="$2"
+  local version
+  if [ "$3" != "" ]; then
+    version=-"$3"
+  fi
 
   if [[ "${optSAVE_PREVIOUS}" != "1" ]]; then
@@ -240 +244 @@
   local FILE=$1
   local optSAVE_PREVIOUS=$2
+  local version
+  if [ "$3" != "" ]; then
+    version=-"$3"
+  fi
 
   if [ "${optSAVE_PREVIOUS}" != "1" ]; then