Ubuntu Pastebin

Paste from cjwatson at Thu, 25 Jun 2015 09:27:33 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/lib/Sbuild/AptResolver.pm b/lib/Sbuild/AptResolver.pm
index 7485cda..cfd0fdd 100644
--- a/lib/Sbuild/AptResolver.pm
+++ b/lib/Sbuild/AptResolver.pm
@@ -70,14 +70,8 @@ sub install_deps {
     my (@instd, @rmvd);
     $self->log("Installing build dependencies\n");
     my @apt_args = ("-yf", \@instd, \@rmvd);
-    if ($cross) {
-	# Cross-building: 'apt-get build-dep' knows how to get the multiarch
-	# details right.
-	push @apt_args,
-	     '-a' . $self->get('Host Arch'), 'build-dep', $dummy_pkg_name;
-    } else {
-	push @apt_args, 'install', $dummy_pkg_name;
-    }
+    push @apt_args, '-a' . $self->get('Host Arch') if $cross;
+    push @apt_args, 'build-dep', $dummy_pkg_name;
 
     if (!$self->run_apt(@apt_args)) {
 	$self->log("Package installation failed\n");
Download as text