summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2016-09-27 15:10:37 -0600
committerGeorge Joseph <gjoseph@digium.com>2016-09-27 15:11:39 -0600
commitf0a2e628d6a1cf52073c7a5a6e4fc1d121f38163 (patch)
tree15aee944c2d0b02e5846dcd18acc2763f4c2147a
parent1e8b3d00ce5249a2899e90d4ef15892af96ee090 (diff)
download_externals: Fix issue with re-install
Needed to ignore an xmlstarlet return code for optional element. Change-Id: I6a96f709b4b38c9a3f3dda4e8b07903787e16873 Reported-by: Dan Jenkins
-rwxr-xr-xbuild_tools/download_externals2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_tools/download_externals b/build_tools/download_externals
index 9b2b84182..2bc357c29 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}