From 6426a55f6e4bb9ca5f0ce3182345259692bd2955 Mon Sep 17 00:00:00 2001 From: loredo Date: Tue, 12 Mar 2019 08:34:36 +0000 Subject: [PATCH] Meta.pm: Use decimal versions for generated version numbers, making dotted-integer versions / semver optional. git-svn-id: https://svn.fhem.de/fhem/trunk@18872 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/Meta.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/Meta.pm b/fhem/FHEM/Meta.pm index a38f21dd5..b5c37c4fc 100644 --- a/fhem/FHEM/Meta.pm +++ b/fhem/FHEM/Meta.pm @@ -1032,7 +1032,7 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(? # seems the author didn't put any explicit # version number we could find ... else { - $modMeta->{version} = "v0.0."; + $modMeta->{version} = '0.'; if ( defined( $modMeta->{x_vcs} ) && $modMeta->{x_vcs}[5] ne '' ) @@ -1044,7 +1044,7 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(? # we don't know anything about this module at all else { $versionFrom = 'generated/blank'; - $modMeta->{version} .= '0'; + $modMeta->{version} .= '.0'; } } @@ -1058,7 +1058,8 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(? $@ .= $modMeta->{x_file}[2] . ": Invalid version format '$modMeta->{version}'" if ( defined( $modMeta->{version} ) - && $modMeta->{version} !~ m/^v\d+\.\d+\.\d+$/ ); + && $modMeta->{version} !~ m/^v\d+\.\d+(?:\.\d+)*$/ + && $modMeta->{version} !~ m/^\d+\.\d+$/ ); # meta name unless ( defined( $modMeta->{name} ) ) {