* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2008-06-01 1:30 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2008-06-01 1:30 UTC (permalink / raw
To: gentoo-commits
vapier 08/06/01 01:30:32
Modified: versionator.eclass
Log:
add eclass documentation by mren #210316
Revision Changes Path
1.14 eclass/versionator.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/versionator.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/versionator.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/versionator.eclass?r1=1.13&r2=1.14
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- versionator.eclass 23 Apr 2007 19:35:05 -0000 1.13
+++ versionator.eclass 1 Jun 2008 01:30:31 -0000 1.14
@@ -1,40 +1,29 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.13 2007/04/23 19:35:05 swegener Exp $
-#
-# Original Author: Ciaran McCreesh <ciaranm@gentoo.org>
-#
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.14 2008/06/01 01:30:31 vapier Exp $
+
+# @ECLASS: versionator.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: functions which simplify manipulation of ${PV} and similar version strings
+# @DESCRIPTION:
# This eclass provides functions which simplify manipulating $PV and similar
# variables. Most functions default to working with $PV, although other
# values can be used.
-#
+# @EXAMPLE:
# Simple Example 1: $PV is 1.2.3b, we want 1_2.3b:
# MY_PV=$(replace_version_separator 1 '_' )
#
# Simple Example 2: $PV is 1.4.5, we want 1:
# MY_MAJORV=$(get_major_version )
#
-# Full list of user usable functions provided by this eclass (see the functions
-# themselves for documentation):
-# get_all_version_components ver_str
-# get_version_components ver_str
-# get_major_version ver_str
-# get_version_component_range range ver_str
-# get_after_major_version ver_str
-# replace_version_separator index newvalue ver_str
-# replace_all_version_separators newvalue ver_str
-# delete_version_separator index ver_str
-# delete_all_version_separators ver_str
-# get_version_component_count ver_str
-# get_last_version_component_index ver_str
-#
# Rather than being a number, the index parameter can be a separator character
# such as '-', '.' or '_'. In this case, the first separator of this kind is
# selected.
#
# There's also:
# version_is_at_least want have
-# which may be buggy, so use with caution.
+# which may be buggy, so use with caution.
# Quick function to toggle the shopts required for some functions on and off
# Used because we can't set extglob in global scope anymore (QA Violation)
@@ -58,6 +47,9 @@
return 0
}
+# @FUNCTION: get_all_version_components
+# @USAGE: [version]
+# @DESCRIPTION:
# Split up a version string into its component parts. If no parameter is
# supplied, defaults to $PV.
# 0.8.3 -> 0 . 8 . 3
@@ -117,6 +109,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: get_version_components
+# @USAGE: [version]
+# @DESCRIPTION:
# Get the important version components, excluding '.', '-' and '_'. Defaults to
# $PV if no parameter is supplied.
# 0.8.3 -> 0 8 3
@@ -132,6 +127,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: get_major_version
+# @USAGE: [version]
+# @DESCRIPTION:
# Get the major version of a value. Defaults to $PV if no parameter is supplied.
# 0.8.3 -> 0
# 7c -> 7
@@ -146,6 +144,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: get_version_component_range
+# @USAGE: [version]
+# @DESCRIPTION:
# Get a particular component or range of components from the version. If no
# version parameter is supplied, defaults to $PV.
# 1 1.2.3 -> 1
@@ -173,6 +174,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: get_after_major_version
+# @USAGE: [version]
+# @DESCRIPTION:
# Get everything after the major version and its separator (if present) of a
# value. Defaults to $PV if no parameter is supplied.
# 0.8.3 -> 8.3
@@ -186,6 +190,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: replace_version_sepaator
+# @USAGE: <search> <replacement> [subject]
+# @DESCRIPTION:
# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not
# supplied). If there are fewer than $1 separators, don't change anything.
# 1 '_' 1.2.3 -> 1_2.3
@@ -222,6 +229,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: replace_all_version_separators
+# @USAGE: <replacement> [subject]
+# @DESCRIPTION:
# Replace all version separators in $2 (defaults to $PV) with $1.
# '_' 1b.2.3 -> 1b_2_3
replace_all_version_separators() {
@@ -233,6 +243,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: delete_version_separator
+# @USAGE: <search> [subject]
+# @DESCRIPTION:
# Delete the $1th separator in $2 (defaults to $PV if $2 is not supplied). If
# there are fewer than $1 separators, don't change anything.
# 1 1.2.3 -> 12.3
@@ -246,6 +259,9 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: delete_all_version_separators
+# @USAGE: [subject]
+# @DESCRIPTION:
# Delete all version separators in $1 (defaults to $PV).
# 1b.2.3 -> 1b23
delete_all_version_separators() {
@@ -254,10 +270,12 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: get_version_component_count
+# @USAGE: [version]
+# @DESCRIPTION:
# How many version components are there in $1 (defaults to $PV)?
# 1.0.1 -> 3
# 3.0c-r1 -> 4
-#
get_version_component_count() {
__versionator_shopt_toggle on
local a
@@ -266,20 +284,25 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: get_last_version_component_index
+# @USAGE: [version]
+# @DESCRIPTION:
# What is the index of the last version component in $1 (defaults to $PV)?
# Equivalent to get_version_component_count - 1.
# 1.0.1 -> 3
# 3.0c-r1 -> 4
-#
get_last_version_component_index() {
__versionator_shopt_toggle on
echo $(( $(get_version_component_count "${1:-${PV}}" ) - 1 ))
__versionator_shopt_toggle off
}
+# @FUNCTION: version_is_at_least
+# @USAGE: <want> [have]
+# @DESCRIPTION:
# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses
# only. May not be reliable, be sure to do very careful testing before actually
-# using this. Prod ciaranm if you find something it can't handle.
+# using this.
version_is_at_least() {
__versionator_shopt_toggle on
local want_s="$1" have_s="${2:-${PVR}}" r
@@ -302,8 +325,11 @@
__versionator_shopt_toggle off
}
-# Takes two parameters (a, b) which are versions. If a is an earlier version
-# than b, returns 1. If a is identical to b, return 2. If b is later than a,
+# @FUNCTION: version_compare
+# @USAGE: <A> <B>
+# @DESCRIPTION:
+# Takes two parameters (A, B) which are versions. If A is an earlier version
+# than B, returns 1. If A is identical to B, return 2. If A is later than B,
# return 3. You probably want version_is_at_least rather than this function.
# May not be very reliable. Test carefully before using this.
version_compare() {
@@ -417,6 +443,9 @@
return 2
}
+# @FUNCTION: version_sort
+# @USAGE: <version> [more versions...]
+# @DESCRIPTION:
# Returns its parameters sorted, highest version last. We're using a quadratic
# algorithm for simplicity, so don't call it with more than a few dozen items.
# Uses version_compare, so be careful.
@@ -548,4 +577,3 @@
done
__versionator_shopt_toggle off
}
-
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2008-06-12 12:48 Christian Faulhammer (opfer)
0 siblings, 0 replies; 8+ messages in thread
From: Christian Faulhammer (opfer) @ 2008-06-12 12:48 UTC (permalink / raw
To: gentoo-commits
opfer 08/06/12 12:48:35
Modified: versionator.eclass
Log:
typo
Revision Changes Path
1.15 eclass/versionator.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/versionator.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/versionator.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/versionator.eclass?r1=1.14&r2=1.15
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- versionator.eclass 1 Jun 2008 01:30:31 -0000 1.14
+++ versionator.eclass 12 Jun 2008 12:48:34 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.14 2008/06/01 01:30:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.15 2008/06/12 12:48:34 opfer Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
@@ -190,7 +190,7 @@
__versionator_shopt_toggle off
}
-# @FUNCTION: replace_version_sepaator
+# @FUNCTION: replace_version_separator
# @USAGE: <search> <replacement> [subject]
# @DESCRIPTION:
# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2010-07-18 21:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2010-07-18 21:24 UTC (permalink / raw
To: gentoo-commits
vapier 10/07/18 21:24:33
Modified: versionator.eclass
Log:
new version_format_string func by Michał Górny #327679
Revision Changes Path
1.16 eclass/versionator.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.15&r2=1.16
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- versionator.eclass 12 Jun 2008 12:48:34 -0000 1.15
+++ versionator.eclass 18 Jul 2010 21:24:33 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.15 2008/06/12 12:48:34 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.16 2010/07/18 21:24:33 vapier Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
@@ -470,6 +470,24 @@
__versionator_shopt_toggle off
}
+# @FUNCTION: version_format_string
+# @USAGE: <format> [version]
+# @DESCRIPTION:
+# Reformat complicated version strings. The first argument is the string
+# to reformat with while the rest of the args are passed on to the
+# get_version_components function. You should make sure to single quote
+# the first argument since it'll have variables that get delayed expansion.s
+# @EXAMPLE:
+# P="cow-hat-1.2.3_p4"
+# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4')
+# Now MY_P will be: cow-hat_source_1_2-3_p4
+version_format_string() {
+ local fstr=$1
+ shift
+ set -- $(get_version_components "$@")
+ eval echo "${fstr}"
+}
+
__versionator__test_version_compare() {
__versionator_shopt_toggle on
local lt=1 eq=2 gt=3 p q
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2010-07-19 20:17 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2010-07-19 20:17 UTC (permalink / raw
To: gentoo-commits
vapier 10/07/19 20:17:36
Modified: versionator.eclass
Log:
switch to eshopts_{push,pop} from eutils
Revision Changes Path
1.17 eclass/versionator.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.16&r2=1.17
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- versionator.eclass 18 Jul 2010 21:24:33 -0000 1.16
+++ versionator.eclass 19 Jul 2010 20:17:35 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.16 2010/07/18 21:24:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.17 2010/07/19 20:17:35 vapier Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
@@ -25,27 +25,7 @@
# version_is_at_least want have
# which may be buggy, so use with caution.
-# Quick function to toggle the shopts required for some functions on and off
-# Used because we can't set extglob in global scope anymore (QA Violation)
-__versionator_shopt_toggle() {
- VERSIONATOR_RECURSION=${VERSIONATOR_RECURSION:-0}
- case "$1" in
- "on")
- if [[ $VERSIONATOR_RECURSION -lt 1 ]] ; then
- VERSIONATOR_OLD_EXTGLOB=$(shopt -p extglob)
- shopt -s extglob
- fi
- VERSIONATOR_RECURSION=$(( $VERSIONATOR_RECURSION + 1 ))
- ;;
- "off")
- VERSIONATOR_RECURSION=$(( $VERSIONATOR_RECURSION - 1 ))
- if [[ $VERSIONATOR_RECURSION -lt 1 ]] ; then
- eval $VERSIONATOR_OLD_EXTGLOB
- fi
- ;;
- esac
- return 0
-}
+inherit eutils
# @FUNCTION: get_all_version_components
# @USAGE: [version]
@@ -58,7 +38,7 @@
# 20040905 -> 20040905
# 3.0c-r1 -> 3 . 0 c - r1
get_all_version_components() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local ver_str=${1:-${PV}} result result_idx=0
result=( )
@@ -66,7 +46,7 @@
# times.
if [[ "${VERSIONATOR_CACHE_VER_STR}" == "${ver_str}" ]] ; then
echo ${VERSIONATOR_CACHE_RESULT}
- __versionator_shopt_toggle off
+ eshopts_pop
return
fi
export VERSIONATOR_CACHE_VER_STR="${ver_str}"
@@ -106,7 +86,7 @@
export VERSIONATOR_CACHE_RESULT="${result[@]}"
echo ${result[@]}
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: get_version_components
@@ -120,11 +100,11 @@
# 20040905 -> 20040905
# 3.0c-r1 -> 3 0 c r1
get_version_components() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local c="$(get_all_version_components "${1:-${PV}}")"
c=( ${c[@]//[-._]/ } )
echo ${c[@]}
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: get_major_version
@@ -137,11 +117,11 @@
# 20040905 -> 20040905
# 3.0c-r1 -> 3
get_major_version() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local c
c=( $(get_all_version_components "${1:-${PV}}" ) )
echo ${c[0]}
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: get_version_component_range
@@ -153,7 +133,7 @@
# 1-2 1.2.3 -> 1.2
# 2- 1.2.3 -> 2.3
get_version_component_range() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local c v="${2:-${PV}}" range="${1}" range_start range_end i=-1 j=0
c=( $(get_all_version_components ${v} ) )
range_start="${range%-*}" ; range_start="${range_start:-1}"
@@ -161,17 +141,17 @@
while (( j < ${range_start} )) ; do
i=$(($i + 1))
- [[ $i -gt ${#c[@]} ]] && __versionator_shopt_toggle off && return
+ [[ $i -gt ${#c[@]} ]] && eshopts_pop && return
[[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1))
done
while (( j <= ${range_end} )) ; do
echo -n ${c[$i]}
- [[ $i -gt ${#c[@]} ]] && __versionator_shopt_toggle off && return
+ [[ $i -gt ${#c[@]} ]] && eshopts_pop && return
[[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1))
i=$(($i + 1))
done
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: get_after_major_version
@@ -185,9 +165,9 @@
# 20040905 -> (empty string)
# 3.0c-r1 -> 0c-r1
get_after_major_version() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
echo $(get_version_component_range 2- "${1:-${PV}}" )
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: replace_version_separator
@@ -201,7 +181,7 @@
# Rather than being a number, $1 can be a separator character such as '-', '.'
# or '_'. In this case, the first separator of this kind is selected.
replace_version_separator() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local w i c found=0 v="${3:-${PV}}"
w=${1:-1}
c=( $(get_all_version_components ${v} ) )
@@ -226,7 +206,7 @@
fi
c=${c[@]}
echo ${c// }
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: replace_all_version_separators
@@ -235,12 +215,12 @@
# Replace all version separators in $2 (defaults to $PV) with $1.
# '_' 1b.2.3 -> 1b_2_3
replace_all_version_separators() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local c
c=( $(get_all_version_components "${2:-${PV}}" ) )
c="${c[@]//[-._]/$1}"
echo ${c// }
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: delete_version_separator
@@ -254,9 +234,9 @@
# Rather than being a number, $1 can be a separator character such as '-', '.'
# or '_'. In this case, the first separator of this kind is deleted.
delete_version_separator() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
replace_version_separator "${1}" "" "${2}"
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: delete_all_version_separators
@@ -265,9 +245,9 @@
# Delete all version separators in $1 (defaults to $PV).
# 1b.2.3 -> 1b23
delete_all_version_separators() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
replace_all_version_separators "" "${1}"
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: get_version_component_count
@@ -277,11 +257,11 @@
# 1.0.1 -> 3
# 3.0c-r1 -> 4
get_version_component_count() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local a
a=( $(get_version_components "${1:-${PV}}" ) )
echo ${#a[@]}
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: get_last_version_component_index
@@ -292,9 +272,9 @@
# 1.0.1 -> 3
# 3.0c-r1 -> 4
get_last_version_component_index() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
echo $(( $(get_version_component_count "${1:-${PV}}" ) - 1 ))
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: version_is_at_least
@@ -304,25 +284,25 @@
# only. May not be reliable, be sure to do very careful testing before actually
# using this.
version_is_at_least() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local want_s="$1" have_s="${2:-${PVR}}" r
version_compare "${want_s}" "${have_s}"
r=$?
case $r in
1|2)
- __versionator_shopt_toggle off
+ eshopts_pop
return 0
;;
3)
- __versionator_shopt_toggle off
+ eshopts_pop
return 1
;;
*)
- __versionator_shopt_toggle off
+ eshopts_pop
die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]"
;;
esac
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: version_compare
@@ -333,7 +313,7 @@
# return 3. You probably want version_is_at_least rather than this function.
# May not be very reliable. Test carefully before using this.
version_compare() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local ver_a=${1} ver_b=${2} parts_a parts_b cur_idx_a=0 cur_idx_b=0
parts_a=( $(get_all_version_components "${ver_a}" ) )
parts_b=( $(get_all_version_components "${ver_b}" ) )
@@ -379,8 +359,8 @@
[[ -z ${cur_tok_b} ]] && cur_tok_b=0
# compare
- [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && __versionator_shopt_toggle off && return 1
- [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && __versionator_shopt_toggle off && return 3
+ [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && eshopts_pop && return 1
+ [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && eshopts_pop && return 3
done
### number parts equal. compare letter parts.
@@ -401,8 +381,8 @@
fi
# compare
- [[ ${letter_a} < ${letter_b} ]] && __versionator_shopt_toggle off && return 1
- [[ ${letter_a} > ${letter_b} ]] && __versionator_shopt_toggle off && return 3
+ [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1
+ [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3
### letter parts equal. compare suffixes in order.
local suffix rule part r_lt r_gt
@@ -427,19 +407,19 @@
[[ -z ${suffix_a} ]] && [[ -z ${suffix_b} ]] && continue
- [[ -z ${suffix_a} ]] && __versionator_shopt_toggle off && return ${r_gt}
- [[ -z ${suffix_b} ]] && __versionator_shopt_toggle off && return ${r_lt}
+ [[ -z ${suffix_a} ]] && eshopts_pop && return ${r_gt}
+ [[ -z ${suffix_b} ]] && eshopts_pop && return ${r_lt}
# avoid octal problems
suffix_a=${suffix_a##+(0)} ; suffix_a=${suffix_a:-0}
suffix_b=${suffix_b##+(0)} ; suffix_b=${suffix_b:-0}
- [[ ${suffix_a} -lt ${suffix_b} ]] && __versionator_shopt_toggle off && return 1
- [[ ${suffix_a} -gt ${suffix_b} ]] && __versionator_shopt_toggle off && return 3
+ [[ ${suffix_a} -lt ${suffix_b} ]] && eshopts_pop && return 1
+ [[ ${suffix_a} -gt ${suffix_b} ]] && eshopts_pop && return 3
done
### no differences.
- __versionator_shopt_toggle off
+ eshopts_pop
return 2
}
@@ -450,7 +430,7 @@
# algorithm for simplicity, so don't call it with more than a few dozen items.
# Uses version_compare, so be careful.
version_sort() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local items= left=0
items=( $@ )
while [[ ${left} -lt ${#items[@]} ]] ; do
@@ -467,7 +447,7 @@
left=$(( ${left} + 1 ))
done
echo ${items[@]}
- __versionator_shopt_toggle off
+ eshopts_pop
}
# @FUNCTION: version_format_string
@@ -489,7 +469,7 @@
}
__versionator__test_version_compare() {
- __versionator_shopt_toggle on
+ eshopts_push -s extglob
local lt=1 eq=2 gt=3 p q
__versionator__test_version_compare_t() {
@@ -593,5 +573,5 @@
__versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2"
__versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3"
done
- __versionator_shopt_toggle off
+ eshopts_pop
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2011-07-07 0:34 Jonathan Callen (abcd)
0 siblings, 0 replies; 8+ messages in thread
From: Jonathan Callen (abcd) @ 2011-07-07 0:34 UTC (permalink / raw
To: gentoo-commits
abcd 11/07/07 00:34:19
Modified: versionator.eclass
Log:
Updates to versionator.eclass
Add self to maintainers.
Add full support for comparing all version specifications allowed by PMS.
Clean up variable usage -- hopefully should make it a little faster (by
using explicit integer variables).
Revision Changes Path
1.18 eclass/versionator.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.17&r2=1.18
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- versionator.eclass 19 Jul 2010 20:17:35 -0000 1.17
+++ versionator.eclass 7 Jul 2011 00:34:19 -0000 1.18
@@ -1,10 +1,10 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.17 2010/07/19 20:17:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.18 2011/07/07 00:34:19 abcd Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
-# base-system@gentoo.org
+# Jonathan Callen <abcd@gentoo.org>, base-system@gentoo.org
# @BLURB: functions which simplify manipulation of ${PV} and similar version strings
# @DESCRIPTION:
# This eclass provides functions which simplify manipulating $PV and similar
@@ -39,52 +39,49 @@
# 3.0c-r1 -> 3 . 0 c - r1
get_all_version_components() {
eshopts_push -s extglob
- local ver_str=${1:-${PV}} result result_idx=0
- result=( )
+ local ver_str=${1:-${PV}} result
+ result=()
# sneaky cache trick cache to avoid having to parse the same thing several
# times.
- if [[ "${VERSIONATOR_CACHE_VER_STR}" == "${ver_str}" ]] ; then
+ if [[ ${VERSIONATOR_CACHE_VER_STR} == ${ver_str} ]] ; then
echo ${VERSIONATOR_CACHE_RESULT}
eshopts_pop
return
fi
- export VERSIONATOR_CACHE_VER_STR="${ver_str}"
+ export VERSIONATOR_CACHE_VER_STR=${ver_str}
- while [[ -n "$ver_str" ]] ; do
- case "${ver_str:0:1}" in
+ while [[ -n $ver_str ]] ; do
+ case "${ver_str::1}" in
# number: parse whilst we have a number
[[:digit:]])
- result[$result_idx]="${ver_str%%[^[:digit:]]*}"
- ver_str="${ver_str##+([[:digit:]])}"
- result_idx=$(($result_idx + 1))
+ result+=("${ver_str%%[^[:digit:]]*}")
+ ver_str=${ver_str##+([[:digit:]])}
;;
# separator: single character
[-_.])
- result[$result_idx]="${ver_str:0:1}"
- ver_str="${ver_str:1}"
- result_idx=$(($result_idx + 1))
+ result+=("${ver_str::1}")
+ ver_str=${ver_str:1}
;;
# letter: grab the letters plus any following numbers
[[:alpha:]])
- local not_match="${ver_str##+([[:alpha:]])*([[:digit:]])}"
- result[$result_idx]=${ver_str:0:$((${#ver_str} - ${#not_match}))}
- ver_str="${not_match}"
- result_idx=$(($result_idx + 1))
+ local not_match=${ver_str##+([[:alpha:]])*([[:digit:]])}
+ # Can't say "${ver_str::-${#not_match}}" in Bash 3.2
+ result+=("${ver_str::${#ver_str} - ${#not_match}}")
+ ver_str=${not_match}
;;
# huh?
*)
- result[$result_idx]="${ver_str:0:1}"
- ver_str="${ver_str:1}"
- result_idx=$(($result_idx + 1))
+ result+=("${ver_str::1}")
+ ver_str=${ver_str:1}
;;
esac
done
- export VERSIONATOR_CACHE_RESULT="${result[@]}"
+ export VERSIONATOR_CACHE_RESULT=${result[*]}
echo ${result[@]}
eshopts_pop
}
@@ -100,11 +97,8 @@
# 20040905 -> 20040905
# 3.0c-r1 -> 3 0 c r1
get_version_components() {
- eshopts_push -s extglob
- local c="$(get_all_version_components "${1:-${PV}}")"
- c=( ${c[@]//[-._]/ } )
- echo ${c[@]}
- eshopts_pop
+ local c=$(get_all_version_components "${1:-${PV}}")
+ echo ${c//[-._]/ }
}
# @FUNCTION: get_major_version
@@ -117,11 +111,8 @@
# 20040905 -> 20040905
# 3.0c-r1 -> 3
get_major_version() {
- eshopts_push -s extglob
- local c
- c=( $(get_all_version_components "${1:-${PV}}" ) )
+ local c=($(get_all_version_components "${1:-${PV}}"))
echo ${c[0]}
- eshopts_pop
}
# @FUNCTION: get_version_component_range
@@ -134,22 +125,23 @@
# 2- 1.2.3 -> 2.3
get_version_component_range() {
eshopts_push -s extglob
- local c v="${2:-${PV}}" range="${1}" range_start range_end i=-1 j=0
- c=( $(get_all_version_components ${v} ) )
- range_start="${range%-*}" ; range_start="${range_start:-1}"
- range_end="${range#*-}" ; range_end="${range_end:-${#c[@]}}"
-
- while (( j < ${range_start} )) ; do
- i=$(($i + 1))
- [[ $i -gt ${#c[@]} ]] && eshopts_pop && return
- [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1))
+ local c v="${2:-${PV}}" range="${1}" range_start range_end
+ local -i i=-1 j=0
+ c=($(get_all_version_components "${v}"))
+ range_start=${range%-*}; range_start=${range_start:-1}
+ range_end=${range#*-} ; range_end=${range_end:-${#c[@]}}
+
+ while ((j < range_start)); do
+ i+=1
+ ((i > ${#c[@]})) && eshopts_pop && return
+ [[ -n "${c[i]//[-._]}" ]] && j+=1
done
- while (( j <= ${range_end} )) ; do
- echo -n ${c[$i]}
- [[ $i -gt ${#c[@]} ]] && eshopts_pop && return
- [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1))
- i=$(($i + 1))
+ while ((j <= range_end)); do
+ echo -n ${c[i]}
+ ((i > ${#c[@]})) && eshopts_pop && return
+ [[ -n "${c[i]//[-._]}" ]] && j+=1
+ i+=1
done
eshopts_pop
}
@@ -165,9 +157,7 @@
# 20040905 -> (empty string)
# 3.0c-r1 -> 0c-r1
get_after_major_version() {
- eshopts_push -s extglob
- echo $(get_version_component_range 2- "${1:-${PV}}" )
- eshopts_pop
+ echo $(get_version_component_range 2- "${1:-${PV}}")
}
# @FUNCTION: replace_version_separator
@@ -182,29 +172,30 @@
# or '_'. In this case, the first separator of this kind is selected.
replace_version_separator() {
eshopts_push -s extglob
- local w i c found=0 v="${3:-${PV}}"
+ local w c v="${3:-${PV}}"
+ declare -i i found=0
w=${1:-1}
- c=( $(get_all_version_components ${v} ) )
- if [[ "${w//[[:digit:]]/}" == "${w}" ]] ; then
+ c=($(get_all_version_components ${v}))
+ if [[ ${w} != *[[:digit:]]* ]] ; then
# it's a character, not an index
- for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do
- if [[ "${c[${i}]}" == "${w}" ]] ; then
- c[${i}]="${2}"
+ for ((i = 0; i < ${#c[@]}; i++)); do
+ if [[ ${c[i]} == ${w} ]]; then
+ c[i]=${2}
break
fi
done
else
- for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do
- if [[ -n "${c[${i}]//[^-._]}" ]] ; then
- found=$(($found + 1))
- if [[ "$found" == "${w}" ]] ; then
- c[${i}]="${2}"
+ for ((i = 0; i < ${#c[@]}; i++)); do
+ if [[ -n "${c[i]//[^-._]}" ]]; then
+ found+=1
+ if ((found == w)); then
+ c[i]=${2}
break
fi
fi
done
fi
- c=${c[@]}
+ c=${c[*]}
echo ${c// }
eshopts_pop
}
@@ -215,12 +206,9 @@
# Replace all version separators in $2 (defaults to $PV) with $1.
# '_' 1b.2.3 -> 1b_2_3
replace_all_version_separators() {
- eshopts_push -s extglob
- local c
- c=( $(get_all_version_components "${2:-${PV}}" ) )
- c="${c[@]//[-._]/$1}"
+ local c=($(get_all_version_components "${2:-${PV}}"))
+ c=${c[@]//[-._]/$1}
echo ${c// }
- eshopts_pop
}
# @FUNCTION: delete_version_separator
@@ -234,9 +222,7 @@
# Rather than being a number, $1 can be a separator character such as '-', '.'
# or '_'. In this case, the first separator of this kind is deleted.
delete_version_separator() {
- eshopts_push -s extglob
replace_version_separator "${1}" "" "${2}"
- eshopts_pop
}
# @FUNCTION: delete_all_version_separators
@@ -245,9 +231,7 @@
# Delete all version separators in $1 (defaults to $PV).
# 1b.2.3 -> 1b23
delete_all_version_separators() {
- eshopts_push -s extglob
replace_all_version_separators "" "${1}"
- eshopts_pop
}
# @FUNCTION: get_version_component_count
@@ -257,11 +241,8 @@
# 1.0.1 -> 3
# 3.0c-r1 -> 4
get_version_component_count() {
- eshopts_push -s extglob
- local a
- a=( $(get_version_components "${1:-${PV}}" ) )
+ local a=($(get_version_components "${1:-${PV}}"))
echo ${#a[@]}
- eshopts_pop
}
# @FUNCTION: get_last_version_component_index
@@ -269,12 +250,10 @@
# @DESCRIPTION:
# What is the index of the last version component in $1 (defaults to $PV)?
# Equivalent to get_version_component_count - 1.
-# 1.0.1 -> 3
-# 3.0c-r1 -> 4
+# 1.0.1 -> 2
+# 3.0c-r1 -> 3
get_last_version_component_index() {
- eshopts_push -s extglob
- echo $(( $(get_version_component_count "${1:-${PV}}" ) - 1 ))
- eshopts_pop
+ echo $(($(get_version_component_count "${1:-${PV}}" ) - 1))
}
# @FUNCTION: version_is_at_least
@@ -284,25 +263,20 @@
# only. May not be reliable, be sure to do very careful testing before actually
# using this.
version_is_at_least() {
- eshopts_push -s extglob
local want_s="$1" have_s="${2:-${PVR}}" r
version_compare "${want_s}" "${have_s}"
r=$?
case $r in
1|2)
- eshopts_pop
return 0
;;
3)
- eshopts_pop
return 1
;;
*)
- eshopts_pop
die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]"
;;
esac
- eshopts_pop
}
# @FUNCTION: version_compare
@@ -314,70 +288,95 @@
# May not be very reliable. Test carefully before using this.
version_compare() {
eshopts_push -s extglob
- local ver_a=${1} ver_b=${2} parts_a parts_b cur_idx_a=0 cur_idx_b=0
+ local ver_a=${1} ver_b=${2} parts_a parts_b
+ local cur_tok_a cur_tok_b num_part_a num_part_b
+ local -i cur_idx_a=0 cur_idx_b=0 prev_idx_a prev_idx_b
parts_a=( $(get_all_version_components "${ver_a}" ) )
parts_b=( $(get_all_version_components "${ver_b}" ) )
### compare number parts.
- local inf_loop=0
- while true ; do
- inf_loop=$(( ${inf_loop} + 1 ))
- [[ ${inf_loop} -gt 20 ]] && \
+ local -i inf_loop=0
+ while true; do
+ inf_loop+=1
+ ((inf_loop > 20)) && \
die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
+ # Store the current index to test later
+ prev_idx_a=cur_idx_a
+ prev_idx_b=cur_idx_b
+
# grab the current number components
- local cur_tok_a=${parts_a[${cur_idx_a}]}
- local cur_tok_b=${parts_b[${cur_idx_b}]}
+ cur_tok_a=${parts_a[cur_idx_a]}
+ cur_tok_b=${parts_b[cur_idx_b]}
# number?
if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then
- cur_idx_a=$(( ${cur_idx_a} + 1 ))
- [[ ${parts_a[${cur_idx_a}]} == "." ]] \
- && cur_idx_a=$(( ${cur_idx_a} + 1 ))
+ cur_idx_a+=1
+ [[ ${parts_a[cur_idx_a]} == . ]] \
+ && cur_idx_a+=1
else
- cur_tok_a=""
+ cur_tok_a=
fi
if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then
- cur_idx_b=$(( ${cur_idx_b} + 1 ))
- [[ ${parts_b[${cur_idx_b}]} == "." ]] \
- && cur_idx_b=$(( ${cur_idx_b} + 1 ))
+ cur_idx_b+=1
+ [[ ${parts_b[cur_idx_b]} == . ]] \
+ && cur_idx_b+=1
else
- cur_tok_b=""
+ cur_tok_b=
fi
# done with number components?
- [[ -z ${cur_tok_a} ]] && [[ -z ${cur_tok_b} ]] && break
+ [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]] && break
- # to avoid going into octal mode, strip any leading zeros. otherwise
- # bash will throw a hissy fit on versions like 6.3.068.
- cur_tok_a=${cur_tok_a##+(0)}
- cur_tok_b=${cur_tok_b##+(0)}
-
- # if a component is blank, make it zero.
- [[ -z ${cur_tok_a} ]] && cur_tok_a=0
- [[ -z ${cur_tok_b} ]] && cur_tok_b=0
-
- # compare
- [[ ${cur_tok_a} -lt ${cur_tok_b} ]] && eshopts_pop && return 1
- [[ ${cur_tok_a} -gt ${cur_tok_b} ]] && eshopts_pop && return 3
+ # if a component is blank, then it is the lesser value
+ [[ -z ${cur_tok_a} ]] && eshopts_pop && return 1
+ [[ -z ${cur_tok_b} ]] && eshopts_pop && return 3
+
+ # According to PMS, if we are *not* in the first number part, and either
+ # token begins with "0", then we use a different algorithm (that
+ # effectively does floating point comparison)
+ if (( prev_idx_a != 0 && prev_idx_b != 0 )) \
+ && [[ ${cur_tok_a} == 0* || ${cur_tok_b} == 0* ]] ; then
+
+ # strip trailing zeros
+ cur_tok_a=${cur_tok_a%%+(0)}
+ cur_tok_b=${cur_tok_b%%+(0)}
+
+ # do a *string* comparison of the resulting values: 2 > 11
+ [[ ${cur_tok_a} < ${cur_tok_b} ]] && eshopts_pop && return 1
+ [[ ${cur_tok_a} > ${cur_tok_b} ]] && eshopts_pop && return 3
+ else
+ # to avoid going into octal mode, strip any leading zeros. otherwise
+ # bash will throw a hissy fit on versions like 6.3.068.
+ cur_tok_a=${cur_tok_a##+(0)}
+ cur_tok_b=${cur_tok_b##+(0)}
+
+ # now if a component is blank, it was originally 0 -- make it so
+ : ${cur_tok_a:=0}
+ : ${cur_tok_b:=0}
+
+ # compare
+ ((cur_tok_a < cur_tok_b)) && eshopts_pop && return 1
+ ((cur_tok_a > cur_tok_b)) && eshopts_pop && return 3
+ fi
done
### number parts equal. compare letter parts.
local letter_a=
- letter_a=${parts_a[${cur_idx_a}]}
- if [[ ${#letter_a} -eq 1 ]] && [[ -z ${letter_a/[a-z]} ]] ; then
- cur_idx_a=$(( ${cur_idx_a} + 1 ))
+ letter_a=${parts_a[cur_idx_a]}
+ if [[ ${#letter_a} -eq 1 && -z ${letter_a/[a-z]} ]] ; then
+ cur_idx_a+=1
else
- letter_a="@"
+ letter_a=@
fi
local letter_b=
- letter_b=${parts_b[${cur_idx_b}]}
- if [[ ${#letter_b} -eq 1 ]] && [[ -z ${letter_b/[a-z]} ]] ; then
- cur_idx_b=$(( ${cur_idx_b} + 1 ))
+ letter_b=${parts_b[cur_idx_b]}
+ if [[ ${#letter_b} -eq 1 && -z ${letter_b/[a-z]} ]] ; then
+ cur_idx_b+=1
else
- letter_b="@"
+ letter_b=@
fi
# compare
@@ -385,38 +384,73 @@
[[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3
### letter parts equal. compare suffixes in order.
- local suffix rule part r_lt r_gt
- for rule in "alpha=1" "beta=1" "pre=1" "rc=1" "p=3" "r=3" ; do
- suffix=${rule%%=*}
- r_lt=${rule##*=}
- [[ ${r_lt} -eq 1 ]] && r_gt=3 || r_gt=1
-
- local suffix_a=
- for part in ${parts_a[@]} ; do
- [[ ${part#${suffix}} != ${part} ]] && \
- [[ -z ${part##${suffix}*([[:digit:]])} ]] && \
- suffix_a=${part#${suffix}}0
- done
+ inf_loop=0
+ while true ; do
+ inf_loop+=1
+ ((inf_loop > 20)) && \
+ die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
+ [[ ${parts_a[cur_idx_a]} == _ ]] && ((cur_idx_a++))
+ [[ ${parts_b[cur_idx_b]} == _ ]] && ((cur_idx_b++))
- local suffix_b=
- for part in ${parts_b[@]} ; do
- [[ ${part#${suffix}} != ${part} ]] && \
- [[ -z ${part##${suffix}*([[:digit:]])} ]] && \
- suffix_b=${part#${suffix}}0
- done
+ cur_tok_a=${parts_a[cur_idx_a]}
+ cur_tok_b=${parts_b[cur_idx_b]}
+ num_part_a=0
+ num_part_b=0
+
+ if has ${cur_tok_a%%+([0-9])} "alpha" "beta" "pre" "rc" "p"; then
+ cur_idx_a+=1
+ num_part_a=${cur_tok_a##+([a-z])}
+ # I don't like octal
+ num_part_a=${num_part_a##+(0)}
+ : ${num_part_a:=0}
+ cur_tok_a=${cur_tok_a%%+([0-9])}
+ else
+ cur_tok_a=
+ fi
- [[ -z ${suffix_a} ]] && [[ -z ${suffix_b} ]] && continue
+ if has ${cur_tok_b%%+([0-9])} alpha beta pre rc p; then
+ cur_idx_b+=1
+ num_part_b=${cur_tok_b##+([a-z])}
+ # I still don't like octal
+ num_part_b=${num_part_b##+(0)}
+ : ${num_part_b:=0}
+ cur_tok_b=${cur_tok_b%%+([0-9])}
+ else
+ cur_tok_b=
+ fi
- [[ -z ${suffix_a} ]] && eshopts_pop && return ${r_gt}
- [[ -z ${suffix_b} ]] && eshopts_pop && return ${r_lt}
+ if [[ ${cur_tok_a} != ${cur_tok_b} ]]; then
+ local suffix
+ for suffix in alpha beta pre rc "" p; do
+ [[ ${cur_tok_a} == ${suffix} ]] && eshopts_pop && return 1
+ [[ ${cur_tok_b} == ${suffix} ]] && eshopts_pop && return 3
+ done
+ elif [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]]; then
+ break
+ else
+ ((num_part_a < num_part_b)) && eshopts_pop && return 1
+ ((num_part_a > num_part_b)) && eshopts_pop && return 3
+ fi
+ done
- # avoid octal problems
- suffix_a=${suffix_a##+(0)} ; suffix_a=${suffix_a:-0}
- suffix_b=${suffix_b##+(0)} ; suffix_b=${suffix_b:-0}
+ # At this point, the only thing that should be left is the -r# part
+ [[ ${parts_a[cur_idx_a]} == - ]] && ((cur_idx_a++))
+ [[ ${parts_b[cur_idx_b]} == - ]] && ((cur_idx_b++))
+
+ # Sanity check
+ if [[ ${parts_a[cur_idx_a]/r+([0-9])} || ${parts_b[cur_idx_b]/r+([0-9])} ]]; then
+ die "versionator compare bug [revisions, ${ver_a}, ${ver_b}]"
+ fi
- [[ ${suffix_a} -lt ${suffix_b} ]] && eshopts_pop && return 1
- [[ ${suffix_a} -gt ${suffix_b} ]] && eshopts_pop && return 3
- done
+ num_part_a=${parts_a[cur_idx_a]#r}
+ num_part_a=${num_part_a##+(0)}
+ : ${num_part_a:=0}
+ num_part_b=${parts_b[cur_idx_b]#r}
+ num_part_b=${num_part_b##+(0)}
+ : ${num_part_b:=0}
+
+ ((num_part_a < num_part_b)) && eshopts_pop && return 1
+ ((num_part_a > num_part_b)) && eshopts_pop && return 3
### no differences.
eshopts_pop
@@ -431,20 +465,21 @@
# Uses version_compare, so be careful.
version_sort() {
eshopts_push -s extglob
- local items= left=0
- items=( $@ )
- while [[ ${left} -lt ${#items[@]} ]] ; do
- local lowest_idx=${left}
- local idx=$(( ${lowest_idx} + 1 ))
- while [[ ${idx} -lt ${#items[@]} ]] ; do
- version_compare "${items[${lowest_idx}]}" "${items[${idx}]}"
- [[ $? -eq 3 ]] && lowest_idx=${idx}
- idx=$(( ${idx} + 1 ))
+ local items=
+ local -i left=0
+ items=("$@")
+ while ((left < ${#items[@]})); do
+ local -i lowest_idx=left
+ local -i idx=lowest_idx+1
+ while ((idx < ${#items[@]})); do
+ version_compare "${items[lowest_idx]}" "${items[idx]}"
+ [[ $? -eq 3 ]] && lowest_idx=idx
+ idx+=1
done
- local tmp=${items[${lowest_idx}]}
- items[${lowest_idx}]=${items[${left}]}
- items[${left}]=${tmp}
- left=$(( ${left} + 1 ))
+ local tmp=${items[lowest_idx]}
+ items[lowest_idx]=${items[left]}
+ items[left]=${tmp}
+ left+=1
done
echo ${items[@]}
eshopts_pop
@@ -456,7 +491,7 @@
# Reformat complicated version strings. The first argument is the string
# to reformat with while the rest of the args are passed on to the
# get_version_components function. You should make sure to single quote
-# the first argument since it'll have variables that get delayed expansion.s
+# the first argument since it'll have variables that get delayed expansions.
# @EXAMPLE:
# P="cow-hat-1.2.3_p4"
# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4')
@@ -507,7 +542,7 @@
1.2.3 $lt 1.2.4
1.2.4 $gt 1.2.3
- 1.2.0 $eq 1.2
+ 1.2.0 $gt 1.2
1.2.1 $gt 1.2
1.2 $lt 1.2.1
@@ -531,7 +566,7 @@
1.0_alpha6-r1 $gt 1.0_alpha6
1.0_beta6-r1 $gt 1.0_alpha6-r2
- 1.0_pre1 $lt 1.0-p1
+ 1.0_pre1 $lt 1.0_p1
1.0p $gt 1.0_p1
1.0r $gt 1.0-r1
@@ -544,7 +579,7 @@
done
- for q in "alpha beta pre rc=${lt};${gt}" "p r=${gt};${lt}" ; do
+ for q in "alpha beta pre rc=${lt};${gt}" "p=${gt};${lt}" ; do
for p in ${q%%=*} ; do
local c=${q##*=}
local alt=${c%%;*} agt=${c##*;}
@@ -564,6 +599,14 @@
__versionator__test_version_compare_t "1_${p}7" $eq "1_${p}7"
__versionator__test_version_compare_t "1_${p}7" $gt "1_${p}6"
__versionator__test_version_compare_t "1_${p}09" $eq "1_${p}9"
+
+ __versionator__test_version_compare_t "1_${p}7-r0" $eq "1_${p}7"
+ __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r1"
+ __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r01"
+ __versionator__test_version_compare_t "1_${p}7-r01" $eq "1_${p}7-r1"
+ __versionator__test_version_compare_t "1_${p}8-r1" $gt "1_${p}7-r100"
+
+ __versionator__test_version_compare_t "1_${p}_alpha" $lt "1_${p}_beta"
done
done
@@ -573,5 +616,78 @@
__versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2"
__versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3"
done
+
+ # The following tests all come from portage's test cases:
+ __versionator__test_version_compare_t "6.0" $gt "5.0"
+ __versionator__test_version_compare_t "5.0" $gt "5"
+ __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
+ __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
+ __versionator__test_version_compare_t "999999999999999999999999999999" $gt "999999999999999999999999999998"
+ __versionator__test_version_compare_t "1.0.0" $gt "1.0"
+ __versionator__test_version_compare_t "1.0.0" $gt "1.0b"
+ __versionator__test_version_compare_t "1b" $gt "1"
+ __versionator__test_version_compare_t "1b_p1" $gt "1_p1"
+ __versionator__test_version_compare_t "1.1b" $gt "1.1"
+ __versionator__test_version_compare_t "12.2.5" $gt "12.2b"
+
+ __versionator__test_version_compare_t "4.0" $lt "5.0"
+ __versionator__test_version_compare_t "5" $lt "5.0"
+ __versionator__test_version_compare_t "1.0_pre2" $lt "1.0_p2"
+ __versionator__test_version_compare_t "1.0_alpha2" $lt "1.0_p2"
+ __versionator__test_version_compare_t "1.0_alpha1" $lt "1.0_beta1"
+ __versionator__test_version_compare_t "1.0_beta3" $lt "1.0_rc3"
+ __versionator__test_version_compare_t "1.001000000000000000001" $lt "1.001000000000000000002"
+ __versionator__test_version_compare_t "1.00100000000" $lt "1.0010000000000000001"
+ __versionator__test_version_compare_t "999999999999999999999999999998" $lt "999999999999999999999999999999"
+ __versionator__test_version_compare_t "1.01" $lt "1.1"
+ __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
+ __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
+ __versionator__test_version_compare_t "1.0" $lt "1.0.0"
+ __versionator__test_version_compare_t "1.0b" $lt "1.0.0"
+ __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
+ __versionator__test_version_compare_t "1" $lt "1b"
+ __versionator__test_version_compare_t "1.1" $lt "1.1b"
+ __versionator__test_version_compare_t "12.2b" $lt "12.2.5"
+
+ __versionator__test_version_compare_t "4.0" $eq "4.0"
+ __versionator__test_version_compare_t "1.0" $eq "1.0"
+ __versionator__test_version_compare_t "1.0-r0" $eq "1.0"
+ __versionator__test_version_compare_t "1.0" $eq "1.0-r0"
+ __versionator__test_version_compare_t "1.0-r0" $eq "1.0-r0"
+ __versionator__test_version_compare_t "1.0-r1" $eq "1.0-r1"
+
+ # The following were just tests for != in portage, we need something a bit
+ # more precise
+ __versionator__test_version_compare_t "1" $lt "2"
+ __versionator__test_version_compare_t "1.0_alpha" $lt "1.0_pre"
+ __versionator__test_version_compare_t "1.0_beta" $gt "1.0_alpha"
+ __versionator__test_version_compare_t "0" $lt "0.0"
+ __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
+ __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
+ __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
+ __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
+ __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
+ __versionator__test_version_compare_t "1b" $gt "1"
+ __versionator__test_version_compare_t "1.1b" $gt "1.1"
+ __versionator__test_version_compare_t "12.2b" $gt "12.2"
+
+ # The following tests all come from paludis's test cases:
+ __versionator__test_version_compare_t "1.0" $gt "1"
+ __versionator__test_version_compare_t "1" $lt "1.0"
+ __versionator__test_version_compare_t "1.0_alpha" $gt "1_alpha"
+ __versionator__test_version_compare_t "1.0_alpha" $gt "1"
+ __versionator__test_version_compare_t "1.0_alpha" $lt "1.0"
+ __versionator__test_version_compare_t "1.2.0.0_alpha7-r4" $gt "1.2_alpha7-r4"
+
+ __versionator__test_version_compare_t "0001" $eq "1"
+ __versionator__test_version_compare_t "01" $eq "001"
+ __versionator__test_version_compare_t "0001.1" $eq "1.1"
+ __versionator__test_version_compare_t "01.01" $eq "1.01"
+ __versionator__test_version_compare_t "1.010" $eq "1.01"
+ __versionator__test_version_compare_t "1.00" $eq "1.0"
+ __versionator__test_version_compare_t "1.0100" $eq "1.010"
+ __versionator__test_version_compare_t "1" $eq "1-r0"
+ __versionator__test_version_compare_t "1-r00" $eq "1-r0"
+
eshopts_pop
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2011-11-22 18:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-22 18:40 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/22 18:40:14
Modified: versionator.eclass
Log:
fix usage on get_version_component_range
Revision Changes Path
1.19 eclass/versionator.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.18&r2=1.19
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- versionator.eclass 7 Jul 2011 00:34:19 -0000 1.18
+++ versionator.eclass 22 Nov 2011 18:40:14 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.18 2011/07/07 00:34:19 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.19 2011/11/22 18:40:14 vapier Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
@@ -116,7 +116,7 @@
}
# @FUNCTION: get_version_component_range
-# @USAGE: [version]
+# @USAGE: <range> [version]
# @DESCRIPTION:
# Get a particular component or range of components from the version. If no
# version parameter is supplied, defaults to $PV.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2011-12-10 8:36 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-10 8:36 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/10 08:36:31
Modified: versionator.eclass
Log:
avoid multiple inclusions when possible to speed caching up
Revision Changes Path
1.21 eclass/versionator.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.20&r2=1.21
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- versionator.eclass 22 Nov 2011 18:42:10 -0000 1.20
+++ versionator.eclass 10 Dec 2011 08:36:31 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.20 2011/11/22 18:42:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.21 2011/12/10 08:36:31 vapier Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
@@ -26,6 +26,9 @@
# version_is_at_least want have
# which may be buggy, so use with caution.
+if [[ ${___ECLASS_ONCE_VERSIONATOR} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_VERSIONATOR="recur -_+^+_- spank"
+
inherit eutils
# @FUNCTION: get_all_version_components
@@ -692,3 +695,5 @@
eshopts_pop
}
+
+fi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass
@ 2011-12-15 5:10 Mike Frysinger (vapier)
0 siblings, 0 replies; 8+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-15 5:10 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/15 05:10:25
Modified: versionator.eclass
Log:
relocate tests to tests/ subdir
Revision Changes Path
1.22 eclass/versionator.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/versionator.eclass?r1=1.21&r2=1.22
Index: versionator.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- versionator.eclass 10 Dec 2011 08:36:31 -0000 1.21
+++ versionator.eclass 15 Dec 2011 05:10:25 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.21 2011/12/10 08:36:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.22 2011/12/15 05:10:25 vapier Exp $
# @ECLASS: versionator.eclass
# @MAINTAINER:
@@ -507,193 +507,4 @@
eval echo "${fstr}"
}
-__versionator__test_version_compare() {
- eshopts_push -s extglob
- local lt=1 eq=2 gt=3 p q
-
- __versionator__test_version_compare_t() {
- version_compare "${1}" "${3}"
- local r=$?
- [[ ${r} -eq ${2} ]] || echo "FAIL: ${@} (got ${r} exp ${2})"
- }
-
- echo "
- 0 $lt 1
- 1 $lt 2
- 2 $gt 1
- 2 $eq 2
- 0 $eq 0
- 10 $lt 20
- 68 $eq 068
- 068 $gt 67
- 068 $lt 69
-
- 1.0 $lt 2.0
- 2.0 $eq 2.0
- 2.0 $gt 1.0
-
- 1.0 $gt 0.0
- 0.0 $eq 0.0
- 0.0 $lt 1.0
-
- 0.1 $lt 0.2
- 0.2 $eq 0.2
- 0.3 $gt 0.2
-
- 1.2 $lt 2.1
- 2.1 $gt 1.2
-
- 1.2.3 $lt 1.2.4
- 1.2.4 $gt 1.2.3
-
- 1.2.0 $gt 1.2
- 1.2.1 $gt 1.2
- 1.2 $lt 1.2.1
-
- 1.2b $eq 1.2b
- 1.2b $lt 1.2c
- 1.2b $gt 1.2a
- 1.2b $gt 1.2
- 1.2 $lt 1.2a
-
- 1.3 $gt 1.2a
- 1.3 $lt 1.3a
-
- 1.0_alpha7 $lt 1.0_beta7
- 1.0_beta $lt 1.0_pre
- 1.0_pre5 $lt 1.0_rc2
- 1.0_rc2 $lt 1.0
-
- 1.0_p1 $gt 1.0
- 1.0_p1-r1 $gt 1.0_p1
-
- 1.0_alpha6-r1 $gt 1.0_alpha6
- 1.0_beta6-r1 $gt 1.0_alpha6-r2
-
- 1.0_pre1 $lt 1.0_p1
-
- 1.0p $gt 1.0_p1
- 1.0r $gt 1.0-r1
- 1.6.15 $gt 1.6.10-r2
- 1.6.10-r2 $lt 1.6.15
-
- " | while read a b c ; do
- [[ -z "${a}${b}${c}" ]] && continue;
- __versionator__test_version_compare_t "${a}" "${b}" "${c}"
- done
-
-
- for q in "alpha beta pre rc=${lt};${gt}" "p=${gt};${lt}" ; do
- for p in ${q%%=*} ; do
- local c=${q##*=}
- local alt=${c%%;*} agt=${c##*;}
- __versionator__test_version_compare_t "1.0" $agt "1.0_${p}"
- __versionator__test_version_compare_t "1.0" $agt "1.0_${p}1"
- __versionator__test_version_compare_t "1.0" $agt "1.0_${p}068"
-
- __versionator__test_version_compare_t "2.0_${p}" $alt "2.0"
- __versionator__test_version_compare_t "2.0_${p}1" $alt "2.0"
- __versionator__test_version_compare_t "2.0_${p}068" $alt "2.0"
-
- __versionator__test_version_compare_t "1.0_${p}" $eq "1.0_${p}"
- __versionator__test_version_compare_t "0.0_${p}" $lt "0.0_${p}1"
- __versionator__test_version_compare_t "666_${p}3" $gt "666_${p}"
-
- __versionator__test_version_compare_t "1_${p}7" $lt "1_${p}8"
- __versionator__test_version_compare_t "1_${p}7" $eq "1_${p}7"
- __versionator__test_version_compare_t "1_${p}7" $gt "1_${p}6"
- __versionator__test_version_compare_t "1_${p}09" $eq "1_${p}9"
-
- __versionator__test_version_compare_t "1_${p}7-r0" $eq "1_${p}7"
- __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r1"
- __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r01"
- __versionator__test_version_compare_t "1_${p}7-r01" $eq "1_${p}7-r1"
- __versionator__test_version_compare_t "1_${p}8-r1" $gt "1_${p}7-r100"
-
- __versionator__test_version_compare_t "1_${p}_alpha" $lt "1_${p}_beta"
- done
- done
-
- for p in "-r" "_p" ; do
- __versionator__test_version_compare_t "7.2${p}1" $lt "7.2${p}2"
- __versionator__test_version_compare_t "7.2${p}2" $gt "7.2${p}1"
- __versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2"
- __versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3"
- done
-
- # The following tests all come from portage's test cases:
- __versionator__test_version_compare_t "6.0" $gt "5.0"
- __versionator__test_version_compare_t "5.0" $gt "5"
- __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
- __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
- __versionator__test_version_compare_t "999999999999999999999999999999" $gt "999999999999999999999999999998"
- __versionator__test_version_compare_t "1.0.0" $gt "1.0"
- __versionator__test_version_compare_t "1.0.0" $gt "1.0b"
- __versionator__test_version_compare_t "1b" $gt "1"
- __versionator__test_version_compare_t "1b_p1" $gt "1_p1"
- __versionator__test_version_compare_t "1.1b" $gt "1.1"
- __versionator__test_version_compare_t "12.2.5" $gt "12.2b"
-
- __versionator__test_version_compare_t "4.0" $lt "5.0"
- __versionator__test_version_compare_t "5" $lt "5.0"
- __versionator__test_version_compare_t "1.0_pre2" $lt "1.0_p2"
- __versionator__test_version_compare_t "1.0_alpha2" $lt "1.0_p2"
- __versionator__test_version_compare_t "1.0_alpha1" $lt "1.0_beta1"
- __versionator__test_version_compare_t "1.0_beta3" $lt "1.0_rc3"
- __versionator__test_version_compare_t "1.001000000000000000001" $lt "1.001000000000000000002"
- __versionator__test_version_compare_t "1.00100000000" $lt "1.0010000000000000001"
- __versionator__test_version_compare_t "999999999999999999999999999998" $lt "999999999999999999999999999999"
- __versionator__test_version_compare_t "1.01" $lt "1.1"
- __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
- __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
- __versionator__test_version_compare_t "1.0" $lt "1.0.0"
- __versionator__test_version_compare_t "1.0b" $lt "1.0.0"
- __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
- __versionator__test_version_compare_t "1" $lt "1b"
- __versionator__test_version_compare_t "1.1" $lt "1.1b"
- __versionator__test_version_compare_t "12.2b" $lt "12.2.5"
-
- __versionator__test_version_compare_t "4.0" $eq "4.0"
- __versionator__test_version_compare_t "1.0" $eq "1.0"
- __versionator__test_version_compare_t "1.0-r0" $eq "1.0"
- __versionator__test_version_compare_t "1.0" $eq "1.0-r0"
- __versionator__test_version_compare_t "1.0-r0" $eq "1.0-r0"
- __versionator__test_version_compare_t "1.0-r1" $eq "1.0-r1"
-
- # The following were just tests for != in portage, we need something a bit
- # more precise
- __versionator__test_version_compare_t "1" $lt "2"
- __versionator__test_version_compare_t "1.0_alpha" $lt "1.0_pre"
- __versionator__test_version_compare_t "1.0_beta" $gt "1.0_alpha"
- __versionator__test_version_compare_t "0" $lt "0.0"
- __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
- __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
- __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
- __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
- __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
- __versionator__test_version_compare_t "1b" $gt "1"
- __versionator__test_version_compare_t "1.1b" $gt "1.1"
- __versionator__test_version_compare_t "12.2b" $gt "12.2"
-
- # The following tests all come from paludis's test cases:
- __versionator__test_version_compare_t "1.0" $gt "1"
- __versionator__test_version_compare_t "1" $lt "1.0"
- __versionator__test_version_compare_t "1.0_alpha" $gt "1_alpha"
- __versionator__test_version_compare_t "1.0_alpha" $gt "1"
- __versionator__test_version_compare_t "1.0_alpha" $lt "1.0"
- __versionator__test_version_compare_t "1.2.0.0_alpha7-r4" $gt "1.2_alpha7-r4"
-
- __versionator__test_version_compare_t "0001" $eq "1"
- __versionator__test_version_compare_t "01" $eq "001"
- __versionator__test_version_compare_t "0001.1" $eq "1.1"
- __versionator__test_version_compare_t "01.01" $eq "1.01"
- __versionator__test_version_compare_t "1.010" $eq "1.01"
- __versionator__test_version_compare_t "1.00" $eq "1.0"
- __versionator__test_version_compare_t "1.0100" $eq "1.010"
- __versionator__test_version_compare_t "1" $eq "1-r0"
- __versionator__test_version_compare_t "1-r00" $eq "1-r0"
-
- eshopts_pop
-}
-
fi
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-12-15 5:10 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-22 18:40 [gentoo-commits] gentoo-x86 commit in eclass: versionator.eclass Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2011-12-15 5:10 Mike Frysinger (vapier)
2011-12-10 8:36 Mike Frysinger (vapier)
2011-07-07 0:34 Jonathan Callen (abcd)
2010-07-19 20:17 Mike Frysinger (vapier)
2010-07-18 21:24 Mike Frysinger (vapier)
2008-06-12 12:48 Christian Faulhammer (opfer)
2008-06-01 1:30 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox