[yade] 03/03: Fix warning in stderr, which broke autopkgtest.

Anton Gladky gladk at moszumanska.debian.org
Fri Jul 25 18:55:25 UTC 2014


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository yade.

commit 2babdea8eacba1d59dbb6b1281c8398a39a5e404
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Jul 25 20:54:52 2014 +0200

    Fix warning in stderr, which broke autopkgtest.
---
 debian/patches/04_modify_description.patch | 34 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/04_modify_description.patch b/debian/patches/04_modify_description.patch
new file mode 100644
index 0000000..c8798b0
--- /dev/null
+++ b/debian/patches/04_modify_description.patch
@@ -0,0 +1,34 @@
+From d4af522fee5b2b629ed84b4cbfc7e736e53dfe25 Mon Sep 17 00:00:00 2001
+From: Anton Gladky <gladky.anton at gmail.com>
+Date: Tue, 22 Jul 2014 18:53:46 +0200
+Subject: [PATCH] Modify slightly description of save-loadVars
+
+Doctest was producing warnings, because variables were
+overwriting. Do not execute loadVars command, but let
+it be in documentation.
+---
+ py/utils.py | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/py/utils.py b/py/utils.py
+index 13a9dae..8c3a995 100644
+--- a/py/utils.py
++++ b/py/utils.py
+@@ -37,12 +37,8 @@ def saveVars(mark='',loadNow=True,**kw):
+ 		(1, 2, 3)
+ 
+ 	those variables will be save in the .xml file, when the simulation itself is saved. To recover those variables once the .xml is loaded again, use
+-
+-		>>> loadVars('something')
+-
+-	and they will be defined in the yade.params.\ *mark* module. The *loadNow* parameter calls :yref:`yade.utils.loadVars` after saving automatically.
+-	
+-	If 'something' already exists, given variables will be inserted.
++	``loadVars('something')``and they will be defined in the yade.params.\ *mark* module. The *loadNow* parameter calls :yref:`yade.utils.loadVars`
++	after saving automatically. If 'something' already exists, given variables will be inserted.
+ 	"""
+ 	import cPickle
+ 	try: 
+-- 
+1.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index cabe29e..e6a7f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_remove_google_analytics.patch
 02_redirect_stdout.patch
 03_redirect_stdout.patch
+04_modify_description.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git



More information about the debian-science-commits mailing list