summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-08-02 23:39:13 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-08-02 23:39:13 (EDT)
commitf9f5d5bdc3de328f0bb89854a4f1c85ab2988bfb (patch)
tree620c7522a900a4253083a06df16e1168cddc5a51
parent15cbd51d3715b26cc1fe692259d8dc11cc9796c7 (diff)
Detect absence of binary package directories.
Or detect presence of clever user.
-rw-r--r--locale/en_US.sh2
-rw-r--r--src/opkbuild.sh7
2 files changed, 9 insertions, 0 deletions
diff --git a/locale/en_US.sh b/locale/en_US.sh
index 756a777..49329c5 100644
--- a/locale/en_US.sh
+++ b/locale/en_US.sh
@@ -97,6 +97,8 @@ oh_str_build_arch_stat_header='Build system:'
oh_str_arch_stat_arch=' Architecture: %s'
oh_str_arch_stat_plat=' Platform: %s'
oh_str_host_arch_stat_header='Host system:'
+oh_str_asterisk_binary_package='Clever user found'
+oh_str_no_binary_packages='No binary packages found'
oh_str_cant_make_work_area='Can'\''t make work area'
oh_str_cant_enter_work_area='Can'\''t enter work area'
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index 56a359b..832b43c 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -410,6 +410,13 @@ step_bincontrol()
for pkg in ../*.pkg/; do
pkg="${pkg#../}"
pkg="${pkg%.pkg/}"
+ if [ "${pkg}" = '*' ]; then
+ if [ -d '../*.pkg' ]; then
+ oh_error "${oh_str_asterisk_binary_package}"
+ else
+ oh_error "${oh_str_no_binary_packages}"
+ fi
+ fi
oh_control_parse_binary "${pkg}"
for field in ${OH_CONTROL_BINARY_FIELDS_REQUIRED} \
${OH_CONTROL_BINARY_FIELDS_OPTIONAL}; do