This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch experimental in repository eclipse-pydev.
commit 2dd640709f10be4e603a6129a326ec869bb3fd13 Author: Markus Koschany <[email protected]> Date: Thu Feb 26 22:16:56 2015 +0100 Rebase fix-attach-so-path.patch --- debian/patches/fix-attach-so-path.patch | 30 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 31 insertions(+) diff --git a/debian/patches/fix-attach-so-path.patch b/debian/patches/fix-attach-so-path.patch new file mode 100644 index 0000000..3db268e --- /dev/null +++ b/debian/patches/fix-attach-so-path.patch @@ -0,0 +1,30 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 26 Feb 2015 22:16:36 +0100 +Subject: fix attach so path + +--- + .../pysrc/pydevd_attach_to_process/add_code_to_python_process.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/plugins/org.python.pydev/pysrc/pydevd_attach_to_process/add_code_to_python_process.py b/plugins/org.python.pydev/pysrc/pydevd_attach_to_process/add_code_to_python_process.py +index d8dca95..723a524 100644 +--- a/plugins/org.python.pydev/pysrc/pydevd_attach_to_process/add_code_to_python_process.py ++++ b/plugins/org.python.pydev/pysrc/pydevd_attach_to_process/add_code_to_python_process.py +@@ -414,7 +414,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show + print('Attaching with arch: %s'% (arch,)) + + target_dll = os.path.join(filedir, 'attach_linux_%s.so' % suffix) +- target_dll = os.path.normpath(target_dll) ++ target_dll = os.path.normpath('/usr/lib/eclipse-pydev/attach_linux.so') + if not os.path.exists(target_dll): + raise RuntimeError('Could not find dll file to inject: %s' % target_dll) + +@@ -437,8 +437,6 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show + + cmd.extend(["--eval-command='set scheduler-locking off'"]) # If on we'll deadlock. + +- cmd.extend(["--eval-command='set architecture %s'" % arch]) +- + cmd.extend([ + "--eval-command='call dlopen(\"%s\", 2)'" % target_dll, + "--eval-command='call DoAttach(%s, \"%s\", %s)'" % ( diff --git a/debian/patches/series b/debian/patches/series index addcc4e..eff12df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ remove-windows-specific-code.patch remove-winp-usage.patch fix-proc-read-linux-3.17.patch +fix-attach-so-path.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
