[SCM] Debian packaging for openturns www.openturns.org branch, debian, updated. debian/1.1_rc1-3

Denis Barbier bouzim at gmail.com
Mon Dec 10 20:09:34 UTC 2012


The following commit has been merged in the debian branch:
commit b2219570565fa5b8185e4aec153e11b98081321c
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sun Dec 9 21:45:30 2012 +0100

    New patch to fix t_WrapperFile_generic.py failure on kfreebsd.

diff --git a/debian/patches/kfreebsd-fix-t_WrapperFile_generic.patch b/debian/patches/kfreebsd-fix-t_WrapperFile_generic.patch
new file mode 100644
index 0000000..68902dd
--- /dev/null
+++ b/debian/patches/kfreebsd-fix-t_WrapperFile_generic.patch
@@ -0,0 +1,40 @@
+Description: Partially disable t_WrapperFile_generic
+ to not fail on kfreebsd.
+ There is a strange bug on Linux, messages are printed
+ twice when output is redirected.  To workaround this bug,
+ messages are printed twice on non-Linux platforms.
+ It seems that kfreebsd suffers from the same bug, because
+ messages are printed four times.
+ The simplest solution is to not print this message.
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Debian
+Forwarded: no
+Last-Update: 2012-12-9
+
+Index: openturns/python/test/t_WrapperFile_generic.expout
+===================================================================
+--- openturns.orig/python/test/t_WrapperFile_generic.expout
++++ openturns/python/test/t_WrapperFile_generic.expout
+@@ -1,5 +1,3 @@
+-[101,255]
+-[101,255]
+ [25755]
+ 0 1
+ 0 1
+Index: openturns/python/test/t_WrapperFile_generic.py
+===================================================================
+--- openturns.orig/python/test/t_WrapperFile_generic.py
++++ openturns/python/test/t_WrapperFile_generic.py
+@@ -60,12 +60,6 @@ try:
+     model = NumericalMathFunction( wrp )
+ 
+     inP = NumericalPoint( (101,255) )
+-    print inP
+-
+-    # FIXME: on linux / python2 the point is printed twice when redirecting output
+-    if not (('linux' in sys.platform) and (sys.version_info[0] == 2)):
+-        print inP
+-
+     outP = model( inP )
+     print outP
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7069e4c..5e23e58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian-soname.patch
 fix-bigendian.patch
 fix-dtd-search-path.patch
+kfreebsd-fix-t_WrapperFile_generic.patch

-- 
Debian packaging for openturns www.openturns.org



More information about the debian-science-commits mailing list