# HG changeset patch # User "Yann E. MORIN" # Date 1269641843 -3600 # Node ID 09c50430d93bbb9855349f86a808c8ce754bd7ad # Parent eec58bf93a1c141602de6adda41fb50460a17a14 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) diff -r eec58bf93a1c -r 09c50430d93b scripts/populate.in --- a/scripts/populate.in Sat Mar 20 18:42:34 2010 +0100 +++ b/scripts/populate.in Fri Mar 26 23:17:23 2010 +0100 @@ -168,6 +168,7 @@ pushd "${CT_ROOT_DST_DIR}" >/dev/null # First of, copy the forced libraries into the working copy +lib_list= if [ -n "${CT_LIB_FILE}" ]; then lib_list=$("${sed}" -r -e ':loop; s/#.*//;' \ -e 's/[[:space:]]+//g;' \ @@ -175,9 +176,6 @@ -e '/$/N; s/\n//; tloop;' \ "${CT_LIB_FILE}" ) - CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}" \ - |"${sed}" -r -e 's/:+/:/g; s/^:+//; s/:+$//;' \ - ) fi CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}" \ |"${sed}" -r -e 's/^:+//; s/:+$//; s/:+/ /g;' \