[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: c/lintian: Assume dpkg supports multi-arch



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit ebac9a774455efc6a534ffb7270d0ab469c87585
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Apr 30 18:42:25 2016 +0000

    c/lintian: Assume dpkg supports multi-arch
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 commands/lintian | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/commands/lintian b/commands/lintian
index 2dbf4cc..f4388d1 100755
--- a/commands/lintian
+++ b/commands/lintian
@@ -1365,17 +1365,15 @@ sub _find_changes {
         push @archs, $arch if $arch ne '';
     }
     push @archs, $ENV{'DEB_HOST_ARCH'} if exists $ENV{'DEB_HOST_ARCH'};
-    if (system('dpkg', '--assert-multi-arch') == 0) {
-        # Maybe cross-built for something dpkg knows about...
-        open(my $foreign, '-|', 'dpkg', '--print-foreign-architectures');
-        while (my $line = <$foreign>) {
-            chomp $line;
-            # Skip already attempted architectures (e.g. via DEB_BUILD_ARCH)
-            next if any { $_ eq $line } @archs;
-            push @archs, $line;
-        }
-        close($foreign);
-    }
+    # Maybe cross-built for something dpkg knows about...
+    open(my $foreign, '-|', 'dpkg', '--print-foreign-architectures');
+    while (my $line = <$foreign>) {
+        chomp($line);
+        # Skip already attempted architectures (e.g. via DEB_BUILD_ARCH)
+        next if any { $_ eq $line } @archs;
+        push(@archs, $line);
+    }
+    close($foreign);
     push @archs, qw(multi all source);
     foreach my $dir (@dirs) {
         foreach my $arch (@archs) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: