mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-01-11 00:31:56 -06:00
Remove leading zero from IPA_NUM_VERSION
The numeric IPA_NUM_VERSION contained a leading zero, so it was treated as octal value in Python code instead of decimal. https://fedorahosted.org/freeipa/ticket/3622
This commit is contained in:
parent
2ba3140aff
commit
8897b51814
2
Makefile
2
Makefile
@ -10,7 +10,7 @@ TARGET ?= master
|
||||
|
||||
SUPPORTED_PLATFORM ?= redhat
|
||||
|
||||
IPA_NUM_VERSION ?= $(shell printf %02d%02d%02d $(IPA_VERSION_MAJOR) $(IPA_VERSION_MINOR) $(IPA_VERSION_RELEASE))
|
||||
IPA_NUM_VERSION ?= $(shell printf %d%02d%02d $(IPA_VERSION_MAJOR) $(IPA_VERSION_MINOR) $(IPA_VERSION_RELEASE))
|
||||
|
||||
# After updating the version in VERSION you should run the version-update
|
||||
# target.
|
||||
|
@ -20,9 +20,26 @@
|
||||
# The full version including strings
|
||||
VERSION="__VERSION__"
|
||||
|
||||
|
||||
# Just the numeric portion of the version so one can do direct numeric
|
||||
# comparisons to see if the API is compatible.
|
||||
#
|
||||
# How NUM_VERSION was generated changed over time:
|
||||
# Before IPA 3.1.3, it was simply concatenated decimal numbers:
|
||||
# IPA 2.2.2: NUM_VERSION=222
|
||||
# IPA 2.2.99: NUM_VERSION=2299 (development version)
|
||||
# IPA 3.1.0: NUM_VERSION=310
|
||||
# IPA 3.1.3: NUM_VERSION=313
|
||||
# In IPA 3.1.4 and 3.2.0, the version was taken as an octal number due to a bug
|
||||
# (https://fedorahosted.org/freeipa/ticket/3622):
|
||||
# IPA 3.1.4: NUM_VERSION=12356 (octal 030104)
|
||||
# IPA 3.2.0: NUM_VERSION=12416 (octal 030200)
|
||||
# After IPA 3.2.0, it is decimal number where each part has two digits:
|
||||
# IPA 3.2.1: NUM_VERSION=30201
|
||||
# IPA 3.2.99: NUM_VERSION=30299 (development version)
|
||||
# IPA 3.3.0: NUM_VERSION=30300
|
||||
NUM_VERSION=__NUM_VERSION__
|
||||
|
||||
|
||||
# The version of the API.
|
||||
API_VERSION=u'__API_VERSION__'
|
||||
|
Loading…
Reference in New Issue
Block a user