From dc0bdff4f0b143f8624a177247d0ed15731a6d26 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Thu, 4 Feb 2010 11:24:12 +0000
Subject: [PATCH] Fix priority iso-image and 7z arch, IssueID #115

---
 install/calculate | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install/calculate b/install/calculate
index ea64f7b..4646530 100755
--- a/install/calculate
+++ b/install/calculate
@@ -1573,13 +1573,17 @@ sub checksystem{
 			if(/$find($mask)$/){
 				chomp;
 				my $path = $_;
+				my $filetype = $1;
 				if(!$data{linux}){$data{linux} = $path; next;}
 				#выделим номера сравниваемых версий
 				$path=~m/$ver/;
 				my $change = $1;
 				$data{linux}=~m/$ver/;
 				my $cur = $1;
-				if(number_ver($cur) < number_ver($change)){$data{linux} = $path;}
+				$data{linux}=~m/$find($mask)$/;
+				my $curfiletype = $1;
+				if(number_ver($cur) < number_ver($change) || ( number_ver($cur) == number_ver($change) 
+				      	&& index($mask,$curfiletype) > index($mask,$filetype))){$data{linux} = $path;}
 		}	}
 		if($data{linux}){
 			#обрежем путь