The following commit has been merged in the master branch:
commit 724c46e7a65c618d507231658969200b3b655167
Author: Guillem Jover <[email protected]>
Date: Mon Oct 29 07:43:18 2012 +0100
dpkg-checkbuilddeps: Use new Dpkg::Deps::deps_concat instead of ad-hoc code
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index c203710..5bb4c37 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -84,29 +84,15 @@ my $fields = $control->get_source();
my $facts = parse_status("$admindir/status");
unless (defined($bd_value) or defined($bc_value)) {
- $bd_value = 'build-essential:native';
- $bd_value .= ", " . $fields->{"Build-Depends"} if defined
$fields->{"Build-Depends"};
- if (not $ignore_bd_arch and defined $fields->{"Build-Depends-Arch"}) {
- $bd_value .= ", " . $fields->{"Build-Depends-Arch"};
- }
- if (not $ignore_bd_indep and defined $fields->{"Build-Depends-Indep"}) {
- $bd_value .= ", " . $fields->{"Build-Depends-Indep"};
- }
- $bc_value = $fields->{"Build-Conflicts"} if defined
$fields->{"Build-Conflicts"};
- if (not $ignore_bd_arch and defined $fields->{"Build-Conflicts-Arch"}) {
- if ($bc_value) {
- $bc_value .= ", " . $fields->{"Build-Conflicts-Arch"};
- } else {
- $bc_value = $fields->{"Build-Conflicts-Arch"};
- }
- }
- if (not $ignore_bd_indep and defined $fields->{"Build-Conflicts-Indep"}) {
- if ($bc_value) {
- $bc_value .= ", " . $fields->{"Build-Conflicts-Indep"};
- } else {
- $bc_value = $fields->{"Build-Conflicts-Indep"};
- }
- }
+ my @bd_list = ('build-essential:native', $fields->{"Build-Depends"});
+ push @bd_list, $fields->{"Build-Depends-Arch"} if not $ignore_bd_arch;
+ push @bd_list, $fields->{"Build-Depends-Indep"} if not $ignore_bd_indep;
+ $bd_value = deps_concat(@bd_list);
+
+ my @bc_list = ($fields->{"Build-Conflicts"});
+ push @bc_list, $fields->{"Build-Conflicts-Arch"} if not $ignore_bd_arch;
+ push @bc_list, $fields->{"Build-Conflicts-Indep"} if not $ignore_bd_indep;
+ $bc_value = deps_concat(@bc_list);
}
my (@unmet, @conflicts);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
