From 4208c867671ed9dc7ede5b3f2e1972672628d260 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Thu, 18 Jul 2019 14:42:22 -0600 Subject: [PATCH] parts/inc/parse_version: Call fcn to not duplicate logic Change to avoid redundant code; add comment (cherry picked from commit b02f52889c1a5d1d79cb91fd545ce9f6c454c963) Signed-off-by: Nicolas R --- dist/Devel-PPPort/parts/inc/inctools | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dist/Devel-PPPort/parts/inc/inctools b/dist/Devel-PPPort/parts/inc/inctools index 51e368a..dd178fd 100644 --- a/dist/Devel-PPPort/parts/inc/inctools +++ b/dist/Devel-PPPort/parts/inc/inctools @@ -3,21 +3,13 @@ sub format_version { - my $ver = shift; + # Given an input version that is acceptable to parse_version(), return a + # string of the standard representation of it. - $ver =~ s/$/000000/; - my($r,$v,$s) = $ver =~ /(\d+)\.(\d{3})(\d{3})/; - - $v = int $v; - $s = int $s; + my($r,$v,$s) = parse_version(shift); if ($r < 5 || ($r == 5 && $v < 6)) { - if ($s % 10) { - die "invalid version '$ver'\n"; - } - $s /= 10; - - $ver = sprintf "%d.%03d", $r, $v; + my $ver = sprintf "%d.%03d", $r, $v; $s > 0 and $ver .= sprintf "_%02d", $s; return $ver; -- 1.8.3.1