Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in pax-utils: lddtree.py
Date: Thu, 28 Mar 2013 01:17:18
Message-Id: 20130328011714.63BDE2171D@flycatcher.gentoo.org
1 vapier 13/03/28 01:17:14
2
3 Modified: lddtree.py
4 Log:
5 lddtree.py: handle the case where `realpath` is not available (like small initramfs)
6
7 Revision Changes Path
8 1.34 pax-utils/lddtree.py
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?rev=1.34&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?rev=1.34&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?r1=1.33&r2=1.34
13
14 Index: lddtree.py
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v
17 retrieving revision 1.33
18 retrieving revision 1.34
19 diff -u -r1.33 -r1.34
20 --- lddtree.py 28 Mar 2013 00:58:20 -0000 1.33
21 +++ lddtree.py 28 Mar 2013 01:17:14 -0000 1.34
22 @@ -3,7 +3,7 @@
23 # Copyright 2012 Mike Frysinger <vapier@g.o>
24 # Use of this source code is governed by a BSD-style license (BSD-3)
25 # pylint: disable=C0301
26 -# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.33 2013/03/28 00:58:20 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.34 2013/03/28 01:17:14 vapier Exp $
28
29 # TODO: Handle symlinks.
30
31 @@ -91,7 +91,12 @@
32 for p in libpaths]),
33 }
34 wrapper = """#!/bin/sh
35 -base=$(realpath "$0")
36 +if ! base=$(realpath "$0" 2>/dev/null); then
37 + case $0 in
38 + /*) base=$0;;
39 + *) base=${PWD:-`pwd`}/$0;;
40 + esac
41 +fi
42 basedir=${base%%/*}
43 exec \
44 "${basedir}/%(interp)s" \
45 @@ -369,7 +374,7 @@
46
47
48 def _ShowVersion(_option, _opt, _value, _parser):
49 - d = '$Id: lddtree.py,v 1.33 2013/03/28 00:58:20 vapier Exp $'.split()
50 + d = '$Id: lddtree.py,v 1.34 2013/03/28 01:17:14 vapier Exp $'.split()
51 print('%s-%s %s %s' % (d[1].split('.')[0], d[2], d[3], d[4]))
52 sys.exit(0)