* scripts/controllib.pl: Fix parsing of deps when both () and [] are

  specified.
* scripts/controllib.pl: Set $host_arch in controllib.pl:parsedep.
* scripts/dpkg-checkbuilddeps.pl: Don't output the [] stuff when finding
  invalid deps.

diff --git a/ChangeLog b/ChangeLog
index 85cd9e87476fc50cf9f9bb5f4f00efd3d485afb2..1ca7bcaa1ddc347cf1acf57da618fa37624db1ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 17 13:23:15 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/controllib.pl: Fix parsing of deps when both () and [] are
+    specified.
+  * scripts/controllib.pl: Set $host_arch in controllib.pl:parsedep.
+  * scripts/dpkg-checkbuilddeps.pl: Don't output the [] stuff when finding
+    invalid deps.
+
 Tue Sep 16 13:44:06 CDT 2003 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-source.pl: Fix generation of dependency lines.

diff --git a/debian/changelog b/debian/changelog
index 8e07e6597710e61752091780aaac30606f6773d9..d8a363466db127d56d5433be276b6d7a079d1dcf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dpkg (1.10.12) unstable; urgency=low
+
+  * Fix parsing of deps when both () and [] are specified.
+  * Set $host_arch in controllib.pl:parsedep.
+  * dpkg-checkbuilddeps doesn't output the [] stuff when finding invalid
+    deps.
+
+ -- Adam Heath <doogie@debian.org>  Wed, 17 Sep 2003 13:23:15 -0500
+
 dpkg (1.10.12) unstable; urgency=low
 
   * Fix dpkg-source output of build-depends lines.

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index 45d27f28acd111e8e734f67e7cef74b8e5c2bc7a..f7ade049469b145fd386540b68b4c6330b3b34a5 100755 (executable)
--- a/scripts/controllib.pl
+++ b/scripts/controllib.pl
@@ -174,14 +174,18 @@ sub parsecontrolfile {
 sub parsedep {
     my ($dep_line, $use_arch, $reduce_arch) = @_;
     my @dep_list;
+    if (!$host_arch) {
+        $host_arch = `dpkg-architecture -qDEB_HOST_ARCH`;
+        chomp $host_arch;
+    }
     foreach my $dep_and (split(/,\s*/m, $dep_line)) {
         my @or_list = ();
 ALTERNATE:
         foreach my $dep_or (split(/\s*\|\s*/m, $dep_and)) {
             my ($package, $relation, $version);
             $package = $1 if ($dep_or =~ s/^(\S+)\s*//m);
-            ($relation, $version) = ($1, $2) if ($dep_or =~ s/^\((=|<=|>=|<<?|>>?)\s*([^)]+).*\)//m);
-            my @arches = split(/\s+/m, $1) if ($use_arch && $dep_or =~ s/^\[([^]]+)\]//m);
+            ($relation, $version) = ($1, $2) if ($dep_or =~ s/^\((=|<=|>=|<<?|>>?)\s*([^)]+).*\)\s*//m);
+            my @arches = split(/\s+/m, $1) if ($use_arch && $dep_or =~ s/^\[([^]]+)\]\s*//m);
             if ($reduce_arch && @arches) {
 
                 my $seen_arch='';

diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 9fbd5ade0c09261d2ffb0d8f1039e5e39e4f65e9..d7d3d846c98f562ecfb08411e6cee6736058e98f 100755 (executable)
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -136,7 +136,7 @@ ALTERNATE:  foreach my $alternate (@$dep_and) {
 
                        # This is a possibile way to meet the dependency.
                        # Remove the arch stuff from $alternate.
-                       push @possibles, $package . ($relation && $version ? " ($relation $version)" : '') . (@$arch_list ? " [@$arch_list]" : '');
+                       push @possibles, $package . ($relation && $version ? " ($relation $version)" : '');
        
                        if ($relation && $version) {
                                if (! exists $version{$package}) {