[gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/

[gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/

[Christoph Junghans]

commit:     5235aa5caf2400663e27d53dad943d6bd728c990
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Sun Jun  2 20:57:54 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> 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~.

[gentoo-commits] proj/sci:master commit in: sys-cluster/modules/files/

[Justin Lecher]

commit:     af75dafdcb945f51121a3093b577c1fcbd3d7d15
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Wed Jun 26 07:08:53 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 07:08:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=af75dafd

removed superfluous lines from patches

---
 sys-cluster/modules/files/modules-3.2.10-errorline.patch | 1 -
 sys-cluster/modules/files/modules-3.2.9c-errorline.patch | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sys-cluster/modules/files/modules-3.2.10-errorline.patch b/sys-cluster/modules/files/modules-3.2.10-errorline.patch
index a319ac8..b2962f1 100644
--- a/sys-cluster/modules/files/modules-3.2.10-errorline.patch
+++ b/sys-cluster/modules/files/modules-3.2.10-errorline.patch
@@ -12,4 +12,3 @@ diff -ru modules-3.2.9-old/cmdModule.c modules-3.2.9/cmdModule.c
  	    			/* FALLTHROUGH */
  
              case TCL_LEVEL0_RETURN:
-Nur in modules-3.2.9: cmdModule.c~.

diff --git a/sys-cluster/modules/files/modules-3.2.9c-errorline.patch b/sys-cluster/modules/files/modules-3.2.9c-errorline.patch
index a319ac8..b2962f1 100644
--- a/sys-cluster/modules/files/modules-3.2.9c-errorline.patch
+++ b/sys-cluster/modules/files/modules-3.2.9c-errorline.patch
@@ -12,4 +12,3 @@ diff -ru modules-3.2.9-old/cmdModule.c modules-3.2.9/cmdModule.c
  	    			/* FALLTHROUGH */
  
              case TCL_LEVEL0_RETURN:
-Nur in modules-3.2.9: cmdModule.c~.