From 3760bb5c7f6b2cc24cc263d7c3e8b7348b8ed5bf Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Tue, 8 Feb 2011 13:13:52 +0000 Subject: Allow submitting drakx-installer-images where BuildRequires version is in the name --- lib/Youri/Submit/Check/Deps.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'lib/Youri/Submit') diff --git a/lib/Youri/Submit/Check/Deps.pm b/lib/Youri/Submit/Check/Deps.pm index 06567d4..463d29a 100644 --- a/lib/Youri/Submit/Check/Deps.pm +++ b/lib/Youri/Submit/Check/Deps.pm @@ -45,10 +45,23 @@ sub resolvedep { } $notfound; } @requires; + # Try to handle BuildRequires: kernel-server-2.6.37-3.mga-1-1.mga1 + @requires = grep { + my $require = $_; + my $notfound = 1; + if (!$require->[Youri::Package::DEPENDENCY_RANGE] && + $require->[Youri::Package::DEPENDENCY_NAME] =~ /-/) { + foreach my $provide (@provides) { + next unless $require->[Youri::Package::DEPENDENCY_NAME] =~ /^$provide->[Youri::Package::DEPENDENCY_NAME]-/; + $notfound = 0; + } + } + $notfound; + } @requires; }; $media->traverse_headers($index); foreach my $require (@requires) { - push (@errors, "Unresolved dep on " . $require->[Youri::Package::DEPENDENCY_NAME] . " " . $require->[Youri::Package::DEPENDENCY_RANGE]); + push (@errors, "Unresolved dep on " . $require->[Youri::Package::DEPENDENCY_NAME] . " " . $require->[Youri::Package::DEPENDENCY_RANGE]); } return @errors; } -- cgit v1.2.1