[Pkg-octave-commit] r2685 - in octave/trunk/debian: . in patches

[Rafael Laboissiere]

tags 516136 pending
thanks

Author: rafael
Date: 2009-02-21 09:19:08 +0000 (Sat, 21 Feb 2009)
New Revision: 2685

Added:
   octave/trunk/debian/patches/visit-script-call-accept.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
Log:
Add patch to fix Bug#516136


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-19 07:07:36 UTC (rev 2684)
+++ octave/trunk/debian/changelog	2009-02-21 09:19:08 UTC (rev 2685)
@@ -1,3 +1,13 @@
+octave3.1 (3.1.52-4) UNRELEASED; urgency=low
+
+  * debian/patches/visit-script-call-accept.dpatch: Add patch to call
+    accept for function and script commands, avoiding crashes when user
+    scripts are loaded again after being changed in the file system
+    (closes: #516136).  This patch was taken from the upstream Mercurial
+    repository, thanks to John W. Eaton.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 21 Feb 2009 10:16:14 +0100
+
 octave3.1 (3.1.52-3) experimental; urgency=low
 
   * Sync with the stable branch

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-19 07:07:36 UTC (rev 2684)
+++ octave/trunk/debian/in/00list	2009-02-21 09:19:08 UTC (rev 2685)
@@ -11,4 +11,5 @@
 dont_set_helvetica-3.1.dpatch
 clean-examples-subdir.dpatch
 real-no-history-3.1.dpatch
+visit-script-call-accept.dpatch
 :]

Added: octave/trunk/debian/patches/visit-script-call-accept.dpatch
===================================================================
--- octave/trunk/debian/patches/visit-script-call-accept.dpatch	                        (rev 0)
+++ octave/trunk/debian/patches/visit-script-call-accept.dpatch	2009-02-21 09:19:08 UTC (rev 2685)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## -*- diff -*-
+## visit-script-call-accept.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoids crashes when user scripts are loaded again after being
+## DP: changed in the file system (fixes Bug#516136).  This patch was
+## DP: taken from the upstream Mercurial repository, thanks to John
+## DP: W. Eaton.
+
+ at DPATCH@
+# HG changeset patch
+# User John W. Eaton <jwe at octave.org>
+# Date 1235157064 18000
+# Node ID 71742f45571ed96e0cc91b14c3647276c0a03994
+# Parent fa981a0530644364cbddbabfae8d218100066c67
+pt-bp.cc: call accept for function and script commands
+
+--- a/src/pt-bp.cc	Fri Feb 20 12:24:03 2009 -0500
++++ b/src/pt-bp.cc	Fri Feb 20 14:11:04 2009 -0500
+@@ -160,15 +160,21 @@
+ }
+ 
+ void
+-tree_breakpoint::visit_octave_user_script (octave_user_script&)
++tree_breakpoint::visit_octave_user_script (octave_user_script& fcn)
+ {
+-  panic_impossible ();
++  tree_statement_list *cmd_list = fcn.body ();
++
++  if (cmd_list)
++    cmd_list->accept (*this);
+ }
+ 
+ void
+-tree_breakpoint::visit_octave_user_function (octave_user_function&)
++tree_breakpoint::visit_octave_user_function (octave_user_function& fcn)
+ {
+-  panic_impossible ();
++  tree_statement_list *cmd_list = fcn.body ();
++
++  if (cmd_list)
++    cmd_list->accept (*this);
+ }
+ 
+ void
+


Property changes on: octave/trunk/debian/patches/visit-script-call-accept.dpatch
___________________________________________________________________
Name: svn:executable
   + *