From: Andreas Barth <aba@not.so.argh.org>
Date: Tue, 25 May 2010 01:30:01 +0000 (+0000)
Subject: call_edos_depcheck: arguments as hash, allow for more than one packages file
X-Git-Url: https://git.donarmstrong.com/?p=wannabuild.git;a=commitdiff_plain;h=5766632be2ce212281af9d376eb2c12b2cdcfd75

call_edos_depcheck: arguments as hash, allow for more than one packages file
---

diff --git a/bin/wanna-build b/bin/wanna-build
index 19276e6..e344ece 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -455,7 +455,7 @@ sub process {
 			parse_quinn_diff(0);
 			@ARGV = ( $ARGS[2] );
 			my $srcs = parse_sources(1);
-			call_edos_depcheck( $ARGS[0], $srcs );
+			call_edos_depcheck( {'arch' => $arch, 'pkgs' => ($ARGS[0]), 'srcs' => $srcs });
 			last SWITCH;
 		};
 		/^merge-all-secondary/ && do {
@@ -478,7 +478,7 @@ sub process {
 			parse_quinn_diff(0);
 			@ARGV = ( $ARGS[2] );
 			my $srcs = parse_sources(1);
-			call_edos_depcheck( $ARGS[3], $srcs );
+			call_edos_depcheck( {'arch' => $arch, 'pkgs' => ($ARGS[3]), 'srcs' => $srcs });
 			last SWITCH;
 		};
 		/^import/ && do {
@@ -2441,8 +2441,8 @@ sub wb_edos_builddebcheck {
 
 
 sub call_edos_depcheck {
-    my $packagesfile = shift;
-    my $srcs = shift;
+    my $args = shift;
+    my $srcs = $args->{'srcs'};
     my $key;
     
     return if defined ($conf::distributions{$distribution}{noadw});
@@ -2483,7 +2483,7 @@ sub call_edos_depcheck {
     }
     close $SOURCES;
 
-    my $edosresults = wb_edos_builddebcheck({'arch' => $arch, 'pkgs' => ($packagesfile), 'src' => $tmpfile});
+    my $edosresults = wb_edos_builddebcheck({'arch' => $args->{'arch'}, 'pkgs' => $args->{'pkgs'}, 'src' => $tmpfile});
     if (ref($edosresults) eq 'HASH') {
         foreach my $key (keys %$edosresults) {
 		if (exists $interesting_packages{$key}) {