70c9c8edbe
Add an upstream patch making make_rel_symlink.py python3 compatible. Add another patch that removes python3 dependency. Fixes: http://autobuild.buildroot.net/results/6c6/6c6e014a751650c16d25dfd3d673bd3199c72b2e/ http://autobuild.buildroot.net/results/857/85724dfd014cec5a80dd18a635826daa2edc1417/ http://autobuild.buildroot.net/results/a74/a74563f700a47065ffd1ba42c83c2d7722bacd89/ and many others. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
From ae2e8cc85b6b4d2202e42d704dde8757ffd31da6 Mon Sep 17 00:00:00 2001
|
|
From: Alec Leamas <leamas.alec@gmail.com>
|
|
Date: Thu, 11 Dec 2014 04:44:49 +0100
|
|
Subject: [PATCH] tools: Make make_rel_symlink.py use python3.
|
|
|
|
Upstream patch:
|
|
http://sourceforge.net/p/lirc/git/ci/ae2e8cc85b6b4d2202e42d704dde8757ffd31da6/
|
|
|
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
---
|
|
tools/make_rel_symlink.py | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
|
|
index 5c893056f379..896637ff93e0 100755
|
|
--- a/tools/make_rel_symlink.py
|
|
+++ b/tools/make_rel_symlink.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/env python3
|
|
|
|
import os
|
|
import os.path
|
|
@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
|
|
sys.argv = sys.argv[ 1:]
|
|
|
|
if len( sys.argv ) != 3:
|
|
- print USAGE
|
|
+ print(USAGE)
|
|
sys.exit( 1 )
|
|
|
|
if os.path.isdir( sys.argv[2] ):
|
|
- print "Removing link target dir:" + sys.argv[2]
|
|
+ print("Removing link target dir:" + sys.argv[2])
|
|
shutil.rmtree( sys.argv[2])
|
|
|
|
link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
|
|
if just_print:
|
|
- print link_path
|
|
+ print(link_path)
|
|
else:
|
|
os.chdir( os.path.dirname( sys.argv[2]))
|
|
target = os.path.basename( sys.argv[2])
|
|
--
|
|
2.1.4
|
|
|