diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-11-10 16:58:15 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-11-10 16:58:15 +0000 |
| commit | 860c8ac929602871f031671e61790ef3db2bfc6e (patch) | |
| tree | 02b0d27c403aba9365b9aef395238922b953a64c /eclass | |
| parent | New eclass function elisp-need-emacs. (diff) | |
| download | emacs-860c8ac929602871f031671e61790ef3db2bfc6e.tar.gz emacs-860c8ac929602871f031671e61790ef3db2bfc6e.tar.bz2 emacs-860c8ac929602871f031671e61790ef3db2bfc6e.zip | |
Revert test in elisp-need-emacs to make it fail for non-numeric have_emacs.
Use [[ ]] since it is more robust than [ ].
svn path=/emacs-overlay/; revision=1534
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/elisp-common.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 61aa554..acec9c2 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -190,6 +190,7 @@ elisp-emacs-version() { # @FUNCTION: elisp-need-emacs # @USAGE: <version> +# @RETURN: 0 if true, 1 otherwise # @DESCRIPTION: # Test if the eselected Emacs version is at least the major version # specified as argument. @@ -197,12 +198,12 @@ elisp-emacs-version() { elisp-need-emacs() { local need_emacs=$1 local have_emacs=$(elisp-emacs-version) - if [ "${have_emacs%%.*}" -lt "${need_emacs%%.*}" ]; then + einfo "Emacs version: ${have_emacs}" + if ! [[ ${have_emacs%%.*} -ge ${need_emacs%%.*} ]]; then eerror "This package needs at least Emacs ${need_emacs%%.*}." eerror "Use \"eselect emacs\" to select the active version." return 1 fi - einfo "Emacs version: ${have_emacs}" return 0 } |