[PATCH 2/2] Remove manual architecture filtering

[Colin Watson <cjwatson@canonical.com>]

dose-builddebcheck takes care of this now.
---
 bin/wanna-build | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/bin/wanna-build b/bin/wanna-build
index 453296f..6d52ede 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -57,8 +57,6 @@ if ( defined $Dpkg::Version::VERSION ) {
     *vercmp = \&Dpkg::Version::vercmp;
 }
 
-use Dpkg::Deps; # TODO: same
-
 our ($verbose, $mail_logs, $list_order, $list_state,
     $curr_date, $op_mode, $user, $real_user, $distribution,
     $fail_reason, $opt_override, $import_from, $export_to,
@@ -1643,32 +1641,6 @@ sub build_deplist {
 }
 
 
-sub remove_archqual {
-    if ($_[0]->isa('Dpkg::Deps::Simple')) {
-        if (defined $_[0]->{'archqual'}) {
-            if (grep { $_ eq $_[0]->{'archqual'} } ('any', 'native')) {
-                undef $_[0]->{'archqual'};
-            } else {
-                return "invalid-architecture-qualifier-$_[0]->{'archqual'}";
-            }
-        }
-    } else {
-        for my $dep ($_[0]->get_deps()) {
-            remove_archqual($dep);
-        }
-    }
-}
-
-sub filterarch {
-    return "" unless $_[0];
-    my $deps = Dpkg::Deps::deps_parse($_[0], ("reduce_arch" => 1, "host_arch" => $_[1], "build_dep" => 1));
-    # Think: Would it be possible that a package has an empty list on some architectures? 
-    # At least as of now, empty is also an error from Dpkg::Deps, so better just prevent anything from building
-    return "empty-dependency-after-parsing" unless $deps;
-    remove_archqual($deps);
-    return $deps->output();
-}
-
 sub explain_dose_dependency {
     my $dep = shift;
     my $pkg = uri_unescape($dep->{'package'});
@@ -1846,12 +1818,12 @@ sub call_dose_builddebcheck {
 	my $pkg = $db->{$key};
 	print $SOURCES "Package: $key\n";
 	print $SOURCES "Version: $pkg->{'version'}\n";
-        my $t = &filterarch($srcs->{$key}{'dep'} || $srcs->{$key}{'depends'}, $args->{'arch'});
-        my $tt = &filterarch($pkg->{'extra_depends'}, $args->{'arch'});
+        my $t = $srcs->{$key}{'dep'} || $srcs->{$key}{'depends'};
+        my $tt = $pkg->{'extra_depends'};
         $t = $t ? ($tt ? "$t, $tt" : $t) : $tt;
 	print $SOURCES "Build-Depends: $t\n" if $t;
-        my $u = &filterarch($srcs->{$key}{'conf'} || $srcs->{$key}{'conflicts'}, $args->{'arch'});
-        my $uu = &filterarch($pkg->{'extra_conflicts'}, $args->{'arch'});
+        my $u = $srcs->{$key}{'conf'} || $srcs->{$key}{'conflicts'};
+        my $uu = $pkg->{'extra_conflicts'};
         $u = $u ? ($uu ? "$u, $uu" : $u) : $uu;
 	print $SOURCES "Build-Conflicts: $u\n" if $u;
 	print $SOURCES "Architecture: all\n";
-- 
1.8.3.2