[buildd-tools-devel] [PATCH 3/3] Don't check xapt exists unless it is configured - this config is rarely, if ever, used.

[Wookey]

---
 lib/Sbuild/Conf.pm |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/Sbuild/Conf.pm b/lib/Sbuild/Conf.pm
index a9a7034..f02c0c4 100644
--- a/lib/Sbuild/Conf.pm
+++ b/lib/Sbuild/Conf.pm
@@ -264,16 +264,19 @@ sub setup ($) {
 	    TYPE => 'STRING',
 	    VARNAME => 'xapt',
 	    GROUP => 'Programs',
+	    CHECK => sub {
+		my $conf = shift;
+		my $entry = shift;
+		my $key = $entry->{'NAME'};
+
+		# Only validate if needed.
+		if ($conf->get('BUILD_DEP_RESOLVER') eq 'xapt') {
+		    $validate_program->($conf, $entry);
+		}
+	    },
 	    CHECK => $validate_program,
 	    DEFAULT => 'xapt'
 	},
-	'EMBUILDDEPS'				=> {
-	    TYPE => 'STRING',
-	    VARNAME => 'embuilddeps',
-	    GROUP => 'Programs',
-	    CHECK => $validate_program,
-	    DEFAULT => 'embuilddeps'
-	},
 	'DPKG_BUILDPACKAGE_USER_OPTIONS'	=> {
 	    TYPE => 'ARRAY:STRING',
 	    GROUP => '__INTERNAL',
-- 
1.7.9.5