scripts/populate: fix handling the forced libraries list-file 1.6
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Mar 26 23:17:23 2010 +0100 (2010-03-26)
branch1.6
changeset 188409c50430d93b
parent 1883 eec58bf93a1c
child 1885 ba680bd7842d
scripts/populate: fix handling the forced libraries list-file

If a list-file is used, then each library in the file will be handled
twice (not a real issue, as the second iteration will find the library
already present, just avoid doing the job twice).
(transplanted from 7fec5db8933cb296c665b8526f27a779aa0c0c7a)
scripts/populate.in
     1.1 --- a/scripts/populate.in	Sat Mar 20 18:42:34 2010 +0100
     1.2 +++ b/scripts/populate.in	Fri Mar 26 23:17:23 2010 +0100
     1.3 @@ -168,6 +168,7 @@
     1.4  pushd "${CT_ROOT_DST_DIR}" >/dev/null
     1.5  
     1.6  # First of, copy the forced libraries into the working copy
     1.7 +lib_list=
     1.8  if [ -n "${CT_LIB_FILE}" ]; then
     1.9      lib_list=$("${sed}" -r -e ':loop; s/#.*//;'         \
    1.10                             -e 's/[[:space:]]+//g;'      \
    1.11 @@ -175,9 +176,6 @@
    1.12                             -e '/$/N; s/\n//; tloop;'    \
    1.13                          "${CT_LIB_FILE}"
    1.14                )
    1.15 -    CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}"             \
    1.16 -                  |"${sed}" -r -e 's/:+/:/g; s/^:+//; s/:+$//;' \
    1.17 -                 )
    1.18  fi
    1.19  CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}"             \
    1.20                |"${sed}" -r -e 's/^:+//; s/:+$//; s/:+/ /g;' \