launchpad-reviewers team mailing list archive

[Steve Langasek <steve.langasek@xxxxxxxxxxxxx>]

Steve Langasek has proposed merging lp:~vorlon/launchpad/sbuild-multiarch-syntax into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~vorlon/launchpad/sbuild-multiarch-syntax/+merge/81385

Fix needed to sbuild to allow it to parse multiarch-annotated
build-dependencies as described at https://wiki.ubuntu.com/MultiarchCross
-- 
https://code.launchpad.net/~vorlon/launchpad/sbuild-multiarch-syntax/+merge/81385
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~vorlon/launchpad/sbuild-multiarch-syntax into lp:launchpad.

=== modified file 'lib/canonical/buildd/sbuild'
--- lib/canonical/buildd/sbuild	2011-04-06 19:35:16 +0000
+++ lib/canonical/buildd/sbuild	2011-11-06 04:27:25 +0000
@@ -2455,6 +2455,12 @@
 	
 	my $deps = $depends . ", " . $conflicts;
 	$deps .= ", " . $dependsi . ", " . $conflictsi if $main::build_arch_all;
+	# For the moment, we treat multiarch-annotated build-dependencies as
+	# the same as any others because we're not implementing a
+	# cross-buildd.
+	$deps =~ s/:any//g;
+	$deps =~ s/:native//g;
+
 	@{$main::deps{$pkg}} = @l;
 	print "Merging pkg deps: $deps\n" if $main::debug;
 	parse_one_srcdep( $pkg, $deps, \%main::deps );