sbotools2

commit 9c49d70d12dd5b03146b04d4d678dd89bc74c174
parent 32abf3c7e9183cfe79019c748e588496722f7426
Author: J Pipkin <j@dawnrazor.net>
Date:   Sun, 13 Jan 2013 04:03:34 -0600

Merge branch 'get_inst_fix', fixes #45

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

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
@@ -260,16 +260,17 @@ sub get_installed_packages($) {
 
 	my $regex = qr#/([^/]+)-([^-]+)-[^-]+-([^-]+)$#;
 	for my $path (<$pkg_db/*>) {
-		my ($name, $version, $build) = ($path =~ $regex)[0,1,2];
-		# valid types: STD, SBO
-		my $type = 'STD';
-		if ($build =~ m/_SBo(|compat32)$/) {
-			my $sbo = $name;
-			$sbo =~ s/-compat32//g if $name =~ /-compat32$/;
-			$type = 'SBO' if get_sbo_location($sbo);
-		}
-		if ($filter eq $type or $filter eq 'ALL') {
-			push @installed, {name => $name, version => $version};
+		if (my ($name, $version, $build) = ($path =~ $regex)[0,1,2]) {
+			# valid types: STD, SBO
+			my $type = 'STD';
+			if ($build =~ m/_SBo(|compat32)$/) {
+				my $sbo = $name;
+				$sbo =~ s/-compat32//g if $name =~ /-compat32$/;
+				$type = 'SBO' if get_sbo_location($sbo);
+			}
+			if ($filter eq $type or $filter eq 'ALL') {
+				push @installed, {name => $name, version => $version};
+			}
 		}
 	}
 	return \@installed;