Skip to content

Commit 9357fb1

Browse files
authored
Merge pull request #745 from voxpupuli/revert-733-version_pattern_fix
Revert "Allow setting `python::version` in hiera to `Integer`"
2 parents bf7607f + 7792165 commit 9357fb1

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

REFERENCE.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,14 +1210,5 @@ Alias of `Pattern[/^(<|>|<=|>=|==) [0-9]*(\.[0-9]+)*$/, /\Alatest\Z/]`
12101210

12111211
Match all valid versions for python
12121212

1213-
Alias of
1214-
1215-
```puppet
1216-
Variant[Integer, Pattern[
1217-
/\A(python)?[0-9](\.?[0-9])*/,
1218-
/\Apypy\Z/,
1219-
/\Asystem\Z/,
1220-
/\Arh-python[0-9]{2}(?:-python)?\Z/
1221-
]]
1222-
```
1213+
Alias of `Pattern[/\A(python)?[0-9](\.?[0-9])*/, /\Apypy\Z/, /\Asystem\Z/, /\Arh-python[0-9]{2}(?:-python)?\Z/]`
12231214

types/version.pp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# @summary Match all valid versions for python
22
#
3-
type Python::Version = Variant[Integer,
4-
Pattern[
5-
/\A(python)?[0-9](\.?[0-9])*/,
6-
/\Apypy\Z/,
7-
/\Asystem\Z/,
8-
/\Arh-python[0-9]{2}(?:-python)?\Z/
9-
]
3+
type Python::Version = Pattern[
4+
/\A(python)?[0-9](\.?[0-9])*/,
5+
/\Apypy\Z/,
6+
/\Asystem\Z/,
7+
/\Arh-python[0-9]{2}(?:-python)?\Z/
108
]

0 commit comments

Comments
 (0)