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

guillem pushed a commit to branch master
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=8fe2c1ebf907f325b6985f471a00843eca77992b

commit 8fe2c1ebf907f325b6985f471a00843eca77992b
Author: Guillem Jover <[email protected]>
AuthorDate: Mon Sep 3 19:28:01 2018 +0200

    Dpkg::Shlibs: Ignore nonexistent directories present in LD_LIBRARY_PATH
    
    We were trying to use realpath() on nonexistent directories, which means
    we'd get undef. Instead just completely ignore nonexistent directories
    from any processing.
    
    Fixes: commit 174a5bd2a080847d0ed901d269a2ba74476eba8b
---
 debian/changelog       | 1 +
 scripts/Dpkg/Shlibs.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f2eef27f2..5030f6a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -160,6 +160,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Dpkg::OpenPGP: Return the destination path on successful ASCII armor
       conversion.
     - Dpkg::Control::Fields: Do not use & sigil for function calls.
+    - Dpkg::Shlibs: Ignore nonexistent directories present in LD_LIBRARY_PATH.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index b5d5bdf64..2b19d14a7 100644
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -96,7 +96,9 @@ sub setup_library_paths {
         foreach my $path (split /:/, $ENV{LD_LIBRARY_PATH}) {
             $path =~ s{/+$}{};
 
-            if (Cwd::realpath($path) =~ m/^\Q$cwd\E/) {
+            my $realpath = Cwd::realpath($path);
+            next unless defined $realpath;
+            if ($realpath =~ m/^\Q$cwd\E/) {
                 warning(g_('deprecated use of LD_LIBRARY_PATH with private ' .
                            'library directory which interferes with ' .
                            'cross-building, please use -l option instead'));

-- 
Dpkg.Org's dpkg

Reply via email to