diff mbox

0012-Do-a-bit-of-cleanup-but-still-broken-resolver.patch

Message ID 20111214181029.GZ28260@dream.aleph1.co.uk
State Accepted
Headers show

Commit Message

Wookey Dec. 14, 2011, 6:10 p.m. UTC 
From 8329066aa7707f560f6625237c6033e6789b543f Mon Sep 17 00:00:00 2001
From: Hector Oron <hector.oron@toby-churchill.com>
Date: Mon, 12 Dec 2011 19:21:29 +0000
Subject: [PATCH 12/17] Do a bit of cleanup, but still broken resolver

Signed-off-by: Hector Oron <hector.oron@toby-churchill.com>
---
 lib/Sbuild/ResolverBase.pm |    7 +------
 lib/Sbuild/XaptResolver.pm |    5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)
diff mbox

Patch

diff --git a/lib/Sbuild/ResolverBase.pm b/lib/Sbuild/ResolverBase.pm
index 8917cb8..c7d23ee 100644
--- a/lib/Sbuild/ResolverBase.pm
+++ b/lib/Sbuild/ResolverBase.pm
@@ -448,12 +448,7 @@  sub run_xapt {
     # dpkg since 1.4.1.18 issues an error on the conffile question if
     # it reads EOF -- hardwire the new --force-confold option to avoid
     # the questions.
-    use Data::Dumper;
-    debug("Source Dir = " . $self->get('Source Dir') . "\n");
-    print "Dump Source Dir\n";
-    print Dumper ($self->get('Source Dir'));
-    # chdir ($dir);
-    my @xapt_command = ($self->get_conf('EMBUILDDEPS'));
+    my @xapt_command = ($self->get_conf('XAPT'));
     my $pipe =
 	$self->pipe_xapt_command(
 	    { COMMAND => \@xapt_command,
diff --git a/lib/Sbuild/XaptResolver.pm b/lib/Sbuild/XaptResolver.pm
index ea795a1..139c202 100644
--- a/lib/Sbuild/XaptResolver.pm
+++ b/lib/Sbuild/XaptResolver.pm
@@ -68,10 +68,7 @@  sub install_deps {
     # Install the dummy package
     my (@instd, @rmvd);
     $self->log("Installing cross-build dependencies\n");
-#    if (!$self->run_apt("-yf", \@instd, \@rmvd, 'install', $dummy_pkg_name)) {
-    print "checking pwd\n";
-    system("pwd");
-    if (!$self->run_xapt("-a", $self->get_conf('HOST_ARCH'))) {
+    if (!$self->run_xapt("-a", $self->get_conf('HOST_ARCH'), @pkgs)) {
 	$self->log("Package installation failed\n");
 	if (defined ($self->get('Session')->get('Session Purged')) &&
 	    $self->get('Session')->get('Session Purged') == 1) {