diff options
| author | Guillem Jover <guillem@debian.org> | 2015-01-13 14:20:04 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2015-01-28 20:50:32 +0100 |
| commit | b815aaeb6f28ee7027ea2a1c66262efa17d706a6 (patch) | |
| tree | 4b24664cd4299aad1f007e117edf93c23c6fd539 /scripts/dpkg-shlibdeps.pl | |
| parent | 79076f9b6161fec2e048f03b3daaa5b81bb723ab (diff) | |
| download | dpkg-b815aaeb6f28ee7027ea2a1c66262efa17d706a6.tar.gz | |
dpkg-shlibdeps: Use dpkg-query instead of dpkg for --search
This has the effect of honoring the admindir passed as an environment
variable, as dpkg sets the variable unconditionally, but dpkg-query
does honor it.
Closes: #775258
Diffstat (limited to 'scripts/dpkg-shlibdeps.pl')
| -rwxr-xr-x | scripts/dpkg-shlibdeps.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 57e6a763f..e52b3608f 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -5,7 +5,7 @@ # Copyright © 1996 Ian Jackson # Copyright © 2000 Wichert Akkerman # Copyright © 2006 Frank Lichtenheld -# Copyright © 2006-2010,2012-2013 Guillem Jover <guillem@debian.org> +# Copyright © 2006-2010,2012-2015 Guillem Jover <guillem@debian.org> # Copyright © 2007 Raphaël Hertzog # # This program is free software; you can redistribute it and/or modify @@ -838,14 +838,14 @@ sub find_packages { return $pkgmatch unless scalar(@files); my $pid = open(my $dpkg_fh, '-|'); - syserr(g_('cannot fork for %s'), 'dpkg --search') unless defined($pid); + syserr(g_('cannot fork for %s'), 'dpkg-query --search') unless defined $pid; if (!$pid) { # Child process running dpkg --search and discarding errors close STDERR; open STDERR, '>', '/dev/null' or syserr(g_('cannot open file %s'), '/dev/null'); $ENV{LC_ALL} = 'C'; - exec('dpkg', '--search', '--', @files) + exec 'dpkg-query', '--search', '--', @files or syserr(g_('unable to execute %s'), 'dpkg'); } while (<$dpkg_fh>) { |