vapier      14/11/20 01:22:36

  Modified:             lddtree.py
  Log:
  lddtree.py: if we could not find the lib for copying, issue a warning and 
skip the path

Revision  Changes    Path
1.56                 pax-utils/lddtree.py

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?rev=1.56&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?rev=1.56&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?r1=1.55&r2=1.56

Index: lddtree.py
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- lddtree.py  20 Nov 2014 01:17:23 -0000      1.55
+++ lddtree.py  20 Nov 2014 01:22:36 -0000      1.56
@@ -4,7 +4,7 @@
 # Copyright 2012-2014 The Chromium OS Authors
 # Use of this source code is governed by a BSD-style license (BSD-3)
 # pylint: disable=C0301
-# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.55 2014/11/20 
01:17:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.56 2014/11/20 
01:22:36 vapier Exp $
 
 """Read the ELF dependency tree and show it
 
@@ -447,7 +447,7 @@
 
 
 def _ShowVersion(_option, _opt, _value, _parser):
-  d = '$Id: lddtree.py,v 1.55 2014/11/20 01:17:23 vapier Exp $'.split()
+  d = '$Id: lddtree.py,v 1.56 2014/11/20 01:22:36 vapier Exp $'.split()
   print('%s-%s %s %s' % (d[1].split('.')[0], d[2], d[3], d[4]))
   sys.exit(0)
 
@@ -557,6 +557,9 @@
   for lib in elf['libs']:
     libdata = elf['libs'][lib]
     path = libdata['realpath']
+    if path is None:
+      warn('could not locate library: %s' % lib)
+      continue
     if not options.libdir:
       libpaths.add(_StripRoot(os.path.dirname(path)))
     _copy(path, libdata['path'], outdir=options.libdir)




Reply via email to