From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 66DCD1381F3 for ; Mon, 3 Jun 2013 23:33:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A73BE0A40; Mon, 3 Jun 2013 23:33:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9023FE09F8 for ; Mon, 3 Jun 2013 23:33:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A691133DC38 for ; Mon, 3 Jun 2013 23:33:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C846E5463 for ; Mon, 3 Jun 2013 23:33:35 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1370206674.5235aa5caf2400663e27d53dad943d6bd728c990.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/modules/files/errorline.patch X-VCS-Directories: sys-cluster/modules/files/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 5235aa5caf2400663e27d53dad943d6bd728c990 X-VCS-Branch: master Date: Mon, 3 Jun 2013 23:33:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bbce8f00-df4e-4511-b531-9979651328e2 X-Archives-Hash: 5d3b1f97b925e0d30295fdba4fd54870 commit: 5235aa5caf2400663e27d53dad943d6bd728c990 Author: Andreas Schäfer gmx de> AuthorDate: Sun Jun 2 20:57:54 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Sun Jun 2 20:57:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5235aa5c implemented clean fix for changed errorline API in TCL --- sys-cluster/modules/files/errorline.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys-cluster/modules/files/errorline.patch b/sys-cluster/modules/files/errorline.patch index dc2efcf..a319ac8 100644 --- a/sys-cluster/modules/files/errorline.patch +++ b/sys-cluster/modules/files/errorline.patch @@ -1,14 +1,15 @@ -diff -ru modules-3.2.9-a/cmdModule.c modules-3.2.9-b/cmdModule.c ---- modules-3.2.9-a/cmdModule.c 2010-11-11 19:23:18.000000000 +0100 -+++ modules-3.2.9-b/cmdModule.c 2013-05-31 20:48:34.000000000 +0200 +diff -ru modules-3.2.9-old/cmdModule.c modules-3.2.9/cmdModule.c +--- modules-3.2.9-old/cmdModule.c 2013-06-02 22:46:09.196302980 +0200 ++++ modules-3.2.9/cmdModule.c 2013-06-02 22:53:36.706298800 +0200 @@ -640,8 +640,8 @@ case TCL_OK: gotPartial = 0; continue; /** while **/ - case TCL_ERROR: interp->errorLine = ((linenum-1)-gotPartial) + - interp->errorLine; -+ case TCL_ERROR: //interp->errorLine = ((linenum-1)-gotPartial) + -+ // interp->errorLine; ++ case TCL_ERROR: Tcl_SetErrorLine(interp, ((linenum-1)-gotPartial) + ++ Tcl_GetErrorLine(interp)); /* FALLTHROUGH */ case TCL_LEVEL0_RETURN: +Nur in modules-3.2.9: cmdModule.c~.