[gentoo-commits] gentoo-projects commit in pax-utils: lddtree.py

[Mike Frysinger (vapier)]

vapier      13/03/26 05:03:42

  Modified:             lddtree.py
  Log:
  lddtree.py: do not try and wrap static ELFs

Revision  Changes    Path
1.27                 pax-utils/lddtree.py

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

Index: lddtree.py
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lddtree.py	26 Mar 2013 04:50:47 -0000	1.26
+++ lddtree.py	26 Mar 2013 05:03:42 -0000	1.27
@@ -3,7 +3,7 @@
 # Copyright 2012 Mike Frysinger <vapier@g.o>
 # 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.26 2013/03/26 04:50:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.27 2013/03/26 05:03:42 vapier Exp $
 
 """Read the ELF dependency tree and show it
 
@@ -367,7 +367,7 @@
 
 
 def _ShowVersion(_option, _opt, _value, _parser):
-  d = '$Id: lddtree.py,v 1.26 2013/03/26 04:50:47 vapier Exp $'.split()
+  d = '$Id: lddtree.py,v 1.27 2013/03/26 05:03:42 vapier Exp $'.split()
   print('%s-%s %s %s' % (d[1].split('.')[0], d[2], d[3], d[4]))
   sys.exit(0)
 
@@ -420,6 +420,11 @@
     if src is None:
       return
 
+    if wrapit:
+      # Static ELFs don't need to be wrapped.
+      if not elf['interp']:
+        wrapit = False
+
     striproot = _StripRoot if striproot else lambda x: x
 
     subdst = striproot(src)