diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-17 08:49:21 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-17 08:49:21 +0000 |
| commit | 5116decd325b9b3d22ada09a92e67974faa34b4a (patch) | |
| tree | c11e7b386a455b5e21f0b266385f5753eeadffec /scripts | |
| parent | 7a415999cb454f198837008e563b73bf01707973 (diff) | |
| download | ptxdist-5116decd325b9b3d22ada09a92e67974faa34b4a.tar.gz ptxdist-5116decd325b9b3d22ada09a92e67974faa34b4a.tar.xz | |
[ptxdist] don't fail if config files don't define certain symbols
This patch fixes the commit
git: 0f0daf95ab605fe17d02d8daf214abf467d42549
svn: 10807
wich introduced a bug, so that projects with one of these symbols
("PTXCONF_PLATFORM, PTXCONF_PROJECT, PTXCONF_PROJECT_VERSION") missing
cannot be build.
Reported-by: Erwin Rol <erwin@erwinrol.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10811 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/libptxdist.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index df3cf6342..5131da5eb 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -123,14 +123,15 @@ ptxd_source_kconfig() { # # return: # 1: symbol not found -# 2: symbol is not valid +# 2: symbol invalid +# 3: config file broken # ptxd_get_ptxconf() { unset "${1}" 2>/dev/null || return 2 if test -f "${PTXDIST_PLATFORMCONFIG}"; then source "${PTXDIST_PLATFORMCONFIG}" || \ - ptxd_bailout "unable to source '${PTXDIST_PLATFORMCONFIG}' (maybe svn/git conflict?)" + ptxd_bailout "unable to source '${PTXDIST_PLATFORMCONFIG}' (maybe svn/git conflict?)" 3 fi if [ -n "${!1}" ]; then echo "${!1}" @@ -139,7 +140,7 @@ ptxd_get_ptxconf() { if test -f "${PTXDIST_PTXCONFIG}"; then source "${PTXDIST_PTXCONFIG}" || \ - ptxd_bailout "unable to source '${PTXDIST_PTXCONFIG}' (maybe svn conflict?)" + ptxd_bailout "unable to source '${PTXDIST_PTXCONFIG}' (maybe svn conflict?)" 3 fi if [ -n "${!1}" ]; then echo "${!1}" @@ -500,11 +501,13 @@ ptxd_debug "Debugging is enabled - Turn off with PTX_DEBUG=false" # print out error message and exit with status 1 # # $1: error message +# $2: optional exit value (1 is default) +# # ${PREFIX}: to be printed before message # ptxd_bailout() { echo "${PREFIX}error: $1" >&2 - exit 1 + exit ${2:-1} } export -f ptxd_bailout |