sbotools2

commit 39f44048a60877c0986621ae02ca66d93a4ec038
parent 5506bd661d4f05aa79df8d00ef7972a746374540
Author: Andreas Guldstrand <andreas.guldstrand@gmail.com>
Date:   Wed, 15 Jun 2016 00:06:09 +0200

SBO::Lib: refactor version_cmp to get kernel version from function

Diffstat:
M
SBO-Lib/lib/SBO/Lib.pm
 | 
13
++++++++++---

1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
@@ -576,9 +576,7 @@ sub get_local_outdated_versions {
 # appended to them
 sub version_cmp {
 	my ($v1, $v2) = @_;
-	my $kv = `uname -r`;
-	chomp $kv;
-	$kv =~ s/-/_/g;
+	my $kv = get_kernel_version();
 
 	if ($v1 =~ /(.+)_\Q$kv\E$/) { $v1 = $1 }
 	if ($v2 =~ /(.+)_\Q$kv\E$/) { $v2 = $1 }
@@ -586,6 +584,15 @@ sub version_cmp {
 	versioncmp($v1, $v2);
 }
 
+sub get_kernel_version {
+	state $kv;
+	return $kv if defined $kv;
+
+	chomp($kv = `uname -r`);
+	$kv =~ s/-/_/g;
+	return $kv;
+}
+
 # pull the sbo name from a $location: $repo_path/system/wine, etc.
 sub get_sbo_from_loc {
 	script_error('get_sbo_from_loc requires an argument.') unless @_ == 1;