[med-svn] [qcumber] 05/05: Add patch with smaller try-except blocks since this helps findinng problems

[Andreas Tille]

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

tille pushed a commit to branch master
in repository qcumber.

commit 72dc42fb8bb9e2db10f688a2272fdc46d13bea04
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 29 16:05:28 2016 +0100

    Add patch with smaller try-except blocks since this helps findinng problems
---
 debian/patches/config_in_etc.patch                 |  2 ++
 debian/patches/series                              |  2 +-
 debian/patches/use_smaller_try-except_blocks.patch | 23 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/patches/config_in_etc.patch b/debian/patches/config_in_etc.patch
index 88b1c68..26a2370 100644
--- a/debian/patches/config_in_etc.patch
+++ b/debian/patches/config_in_etc.patch
@@ -1,6 +1,8 @@
 Author: Andreas Tille <TilleA at rki.de>
 Last-Update: Wed, 16 Mar 2016 11:01:55 +0100
 Description: Config file should be in /etc/qcumber
+ This patch is deyctivated and it is done via symlinks since all
+ attempts to get this working failed so far.
 
 --- a/classes.py
 +++ b/classes.py
diff --git a/debian/patches/series b/debian/patches/series
index ec041aa..c9b5dc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 python3_explicit.patch
 set_absolute_path_to_tex_template.patch
 adapt_config.patch
-# config_in_etc.patch
+use_smaller_try-except_blocks.patch
diff --git a/debian/patches/use_smaller_try-except_blocks.patch b/debian/patches/use_smaller_try-except_blocks.patch
new file mode 100644
index 0000000..f0b933b
--- /dev/null
+++ b/debian/patches/use_smaller_try-except_blocks.patch
@@ -0,0 +1,23 @@
+Author: Andreas Tille <TilleA at rki.de>
+Last-Update: Wed, 16 Mar 2016 11:01:55 +0100
+Description: use smaller try-except blocks
+
+--- a/QCumber.py
++++ b/QCumber.py
+@@ -434,10 +434,16 @@ def main(arguments):
+ 				for line in iter(process.stderr.readline, b''):
+ 					print(line)
+ 				process.communicate()
++		except:
++			print("Creating boxplot result in", join(arguments["output"],"QCResults", "Report", "src", plot["file"]), "failed")
++		try:
+ 			#plot barplots
+ 			tmp_overview.close()
+ 			process = subprocess.Popen(" ".join(["Rscript --vanilla ", join(os.path.dirname(__file__), "barplot.R"),join(tmp, "overview.csv"),
+ 												 join(arguments["output"], "QCResults/Report/src/img")]),stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True)
++		except:
++			print("Rscript --vanilla ", join(os.path.dirname(__file__), "barplot.R"), "overview.csv failed")
++		try:
+ 			for line in iter(process.stderr.readline, b''):
+ 				print(line)
+ 			process.communicate()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/qcumber.git