135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also pretty version for Netdisco

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-28 14:11:35 +01:00
parent ccd279d918
commit f063110111
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm
View File

@@ -85,7 +85,7 @@ sub expire {
$schema->resultset('Node')->search(undef, $schema->resultset('Node')->search(undef,
{columns => 'mac', distinct => 1})->count_rs->as_query, {columns => 'mac', distinct => 1})->count_rs->as_query,
netdisco_ver => $App::Netdisco::VERSION, netdisco_ver => pretty_version($App::Netdisco::VERSION, 3),
snmpinfo_ver => $snmpinfo_ver, snmpinfo_ver => $snmpinfo_ver,
schema_ver => $schema->schema_version, schema_ver => $schema->schema_version,
perl_ver => pretty_version($], 3), perl_ver => pretty_version($], 3),
@@ -105,7 +105,8 @@ sub pretty_version {
$version =~ s/\.//g; $version =~ s/\.//g;
$version = (join '.', reverse map {scalar reverse} $version = (join '.', reverse map {scalar reverse}
unpack("(A${seglen})*", reverse $version)); unpack("(A${seglen})*", reverse $version));
$version =~ s/\.0+/\./g; $version =~ s/\.000/.0/g;
$version =~ s/\.0+([1-9]+)/.$1/g;
return $version; return $version;
} }