aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tom111@gmx.de>2010-10-27 20:13:56 +0200
committerThomas Kahle <tom111@gmx.de>2010-10-27 20:14:44 +0200
commit468bba7ae404b7433eb4ec0365fec920880b7235 (patch)
tree6ff7c11c5ea7e991676dbb5bf402d8fa2016d673 /sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
parentMoved sci-math/nauty and its license to main tree (diff)
downloadsci-468bba7ae404b7433eb4ec0365fec920880b7235.tar.gz
sci-468bba7ae404b7433eb4ec0365fec920880b7235.tar.bz2
sci-468bba7ae404b7433eb4ec0365fec920880b7235.zip
sci-misc/salome-* bumped to 5.1.4
ebuild by Michael Riss in bug 330303
Diffstat (limited to 'sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch')
-rw-r--r--sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
new file mode 100644
index 000000000..2395d95bc
--- /dev/null
+++ b/sci-misc/salome-kernel/files/salome-kernel-5.1.4-python-2.6.patch
@@ -0,0 +1,13 @@
+Only in src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY: .import_hook.py.swp
+diff -ur src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py
+--- src5.1.4.orig/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py 2010-03-07 17:35:38.450323100 +0100
++++ src5.1.4/KERNEL_SRC_5.1.4/src/KERNEL_PY/import_hook.py 2010-03-07 17:37:18.940255407 +0100
+@@ -150,7 +150,7 @@
+ l.append((subname,submod))
+ return l
+
+-def import_hook(name, globals=None, locals=None, fromlist=None, *args):
++def import_hook(name, globals=None, locals=None, fromlist=None, level=-1, *args):
+ """ Import replacement for sharing modules among multiple interpreters
+ Mostly update sys.modules before doing real import
+ """