diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-12-01 23:37:52 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-12-01 23:37:52 +0000 |
| commit | 952a6432320e67b20ae48680652c79c1963ce2ce (patch) | |
| tree | 8d4734263846409952cd32a04d34783fcf5f8004 | |
| parent | b061f5ef682fff8767625637e493edb68afcef20 (diff) | |
| download | ptxdist-952a6432320e67b20ae48680652c79c1963ce2ce.tar.gz ptxdist-952a6432320e67b20ae48680652c79c1963ce2ce.tar.xz | |
* rules/other/Toplevel.make, bin/ptxdist:
fix collection feature
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9175 33e552b5-05e3-0310-8538-816dae2090ed
| -rwxr-xr-x | bin/ptxdist | 41 | ||||
| -rw-r--r-- | rules/other/Toplevel.make | 3 |
2 files changed, 13 insertions, 31 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 8284fe681..5e2fb078a 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -202,7 +202,8 @@ check_ptxconfig() { return 1 fi - if [ -n "${PTXDIST_COLLECTIONCONFIG}" -a ! -e "${PTXDIST_COLLECTIONCONFIG}" ]; then + if [ \! -e "${PTXDIST_COLLECTIONCONFIG}" -a \ + \( -L "${PTXDIST_COLLECTIONCONFIG}" -o "${PTX_collectionconfig_SET}" == "true" \) ]; then ptxd_dialog_msgbox \ "error: '${PTXDIST_COLLECTIONCONFIG#${PTXDIST_WORKSPACE}/}' is missing\n" \ " try 'ptxdist collection <collectionconfig>'" @@ -1102,6 +1103,14 @@ do_select() check_nonstandard "${type}" || return + if [ ! -f "${file}" ]; then + ptxd_dialog_msgbox \ + "error: cannot select\n" \ + " '${file}'\n" \ + " does not exist, or is not a file." + return 1 + fi + # check if magic is present in config file if ! egrep -q "^${magic}$" "${file}" && [ -z "${PTX_FORCE}" ]; then ptxd_dialog_msgbox \ @@ -1117,13 +1126,7 @@ do_select() return 1 fi - if [ ! -f "${file}" ]; then - ptxd_dialog_msgbox \ - "error: cannot select\n" \ - " '${file}'\n" \ - " file does not exist" - return 1 - elif [ -e "${!dest_ptr}" -a \! -L "${!dest_ptr}" ]; then + if [ -e "${!dest_ptr}" -a \! -L "${!dest_ptr}" ]; then ptxd_dialog_msgbox \ "error: '${!dest_ptr}'\n" \ " is not a link. This is mostly not critical, as it usually\n" \ @@ -1848,27 +1851,6 @@ setup_logfile() # -# collection feature needs some extra setup -# -# if PTXDIST_COLLECTIONCONFIG is a link or has been explicitly set -# by the user, keep the PTXDIST_COLLECTIONCONFIG variable. -# -# in case PTXDIST_COLLECTIONCONFIG does not exist unset it -# -setup_collection() { - if [ -L "${PTXDIST_COLLECTIONCONFIG}" -o \ - "${PTX_collectionconfig_SET}" == "true" ]; then - return; - fi - - if [ \! -e "${PTXDIST_COLLECTIONCONFIG}" ]; then - unset PTXDIST_COLLECTIONCONFIG - fi -} - - - -# # export some important vars # so that they can be used in make # @@ -1923,7 +1905,6 @@ setup_path # --- path is now set --- setup_logfile # -- logfile is ready -setup_collection setup_export # -- all important vars are exported diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 933079451..90fafad90 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -21,7 +21,8 @@ include $(RULESDIR)/other/Definitions.make include $(PTXDIST_PTXCONFIG) include $(PTXDIST_PLATFORMCONFIG) -ifdef PTXDIST_COLLECTIONCONFIG +# might be non existent +ifneq ($(wildcard $(PTXDIST_COLLECTIONCONFIG)),) include $(PTXDIST_COLLECTIONCONFIG) endif |