From a77ebb20176b194988b6c2f3a152f165bab60cf2 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Tue, 27 Sep 2016 15:10:37 -0600
Subject: [PATCH] download_externals: Fix issue with re-install
Needed to ignore an xmlstarlet return code for optional element.
Change-Id: I6a96f709b4b38c9a3f3dda4e8b07903787e16873
Reported-by: Dan Jenkins
---
build_tools/download_externals | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build_tools/download_externals b/build_tools/download_externals
index 9b2b841821..2bc357c298 100755
--- a/build_tools/download_externals
+++ b/build_tools/download_externals
@@ -134,7 +134,7 @@ if [[ -f ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml ]] ; then
sums=$(${XMLSTARLET} sel -t -m "//file" -v "@md5sum" -n ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml)
for sum in ${sums} ; do
install_path=$(${XMLSTARLET} sel -t -v "//file[@md5sum = '${sum}']/@install_path" ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml )
- executable=$(${XMLSTARLET} sel -t -v "//file[@md5sum = '${sum}']/@executable" ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml )
+ executable=$(${XMLSTARLET} sel -t -v "//file[@md5sum = '${sum}']/@executable" ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml || : )
f=${DESTDIR}$(eval echo ${install_path})
if [[ ! -f ${f} ]] ; then
echo Not found: ${f}
--
GitLab