jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292 from MilhouseVH/fix_distro_tool2

Browse Source 
distro-tool: Workaround packages that call exit
This commit is contained in:
Christian Hewitt 2016-05-04 08:36:05 +04:00
commit 01dfc98b4e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/distro-tool
View File

@ -456,9 +456,9 @@ class MyThread(threading.Thread):
msgs = [] msgs = []
if pkg_version == "" or pkg_url == "": if pkg_version == "" or pkg_version == "0.0invalid" or pkg_url == "":
if pkg_section != "virtual": if pkg_section != "virtual":
MyUtility.show(msgs, 0, "cyan", "BLANK URL OR VERSION", "%s (ver [%s], url [%s])" % (pkg_name, pkg_version, pkg_url)) MyUtility.show(msgs, 0, "cyan", "UNKNOWN VER OR URL", "%s (ver [%s], url [%s])" % (pkg_name, pkg_version, pkg_url))
self.output_queue.put(msgs) self.output_queue.put(msgs)
continue continue
@ -670,6 +670,11 @@ generate_work() {
fi fi
( (
# Override exit function so that packages calling exit don't terminate this sub-shell
exit() {
:
}
init_progress init_progress
cd $LIBREELEC_DIR cd $LIBREELEC_DIR
@ -678,7 +683,7 @@ generate_work() {
for package_name in ${packages}; do for package_name in ${packages}; do
[ ${PROGRESS} == yes ] && progress ${pcount} [ ${PROGRESS} == yes ] && progress ${pcount}
. config/options ${package_name} 2>/dev/null || true source config/options ${package_name} 2>/dev/null || true
if [ -n "${revision}" ]; then if [ -n "${revision}" ]; then
PKG_URL="${PKG_URL/${PKG_VERSION}/${revision}}" PKG_URL="${PKG_URL/${PKG_VERSION}/${revision}}"