From d771483bd5ca83355ae112ebc9d9b2204802bc05 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 04 Oct 2012 21:12:14 -0400 Subject: Fix message about mutually exclusive options. --- diff --git a/locale/en_US/opkbuild.sh b/locale/en_US/opkbuild.sh index cbac5f0..5d8446e 100644 --- a/locale/en_US/opkbuild.sh +++ b/locale/en_US/opkbuild.sh @@ -48,6 +48,7 @@ This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by P. J. McDermott.' +msg_opkbuild_bbasf_mutex='Options -b, -B, -A, -S, and -F are mutually exclusive' msg_opkbuild_bad_opt='Invalid option "%s"' msg_opkbuild_uid0_cmd_not_found='UID 0 command "%s" not found' msg_opkbuild_uid0_cmd_bad_uid='UID 0 command "%s" doesn'\''t give UID 0' diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 4aa133a..d854128 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -133,31 +133,31 @@ get_options() case "${opt}" in b) if [ -n "${opt_build}" ]; then - oh_error "${oh_str_bbasf_mutex}" + ob_error "$(ob_get_msg 'bbasf_mutex')" fi opt_build='binary' ;; B) if [ -n "${opt_build}" ]; then - oh_error "${oh_str_bbasf_mutex}" + ob_error "$(ob_get_msg 'bbasf_mutex')" fi opt_build='binary-arch' ;; A) if [ -n "${opt_build}" ]; then - oh_error "${oh_str_bbasf_mutex}" + ob_error "$(ob_get_msg 'bbasf_mutex')" fi opt_build='binary-indep' ;; S) if [ -n "${opt_build}" ]; then - oh_error "${oh_str_bbasf_mutex}" + ob_error "$(ob_get_msg 'bbasf_mutex')" fi opt_build='source' ;; F) if [ -n "${opt_build}" ]; then - oh_error "${oh_str_bbasf_mutex}" + ob_error "$(ob_get_msg 'bbasf_mutex')" fi opt_build='full' ;; -- cgit v0.9.1