[SCM] Freefoam packaging. Programs and libraries for Computational Fluid Dynamics (CFD) branch, master, updated. debian/0.1.0+dfsg-1

Michael Wild themiwi at users.sourceforge.net
Fri Aug 17 08:57:35 UTC 2012


The following commit has been merged in the master branch:
commit c14eda922f09f8b46fd59824bc4d1109aef51e93
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Fri Jul 27 10:33:05 2012 +0200

    Fix error in freefoam-log when operating on truncated log files
    
    - Add debian/patches/handle-truncated-logs-in-freefoam-log.diff
    
    Closes:  #682931
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/handle-truncated-logs-in-freefoam-log.diff b/debian/patches/handle-truncated-logs-in-freefoam-log.diff
new file mode 100644
index 0000000..0405351
--- /dev/null
+++ b/debian/patches/handle-truncated-logs-in-freefoam-log.diff
@@ -0,0 +1,29 @@
+From 12af016309fc4828035e16290bc128955507ed43 Mon Sep 17 00:00:00 2001
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Tue, 13 Mar 2012 17:24:22 +0100
+Subject: FIX: Handle truncated logs in freefoam-log
+Origin: http://repo.or.cz/w/freefoam.git?a=commit;h=12af016309fc4828035e16290bc128955507ed43
+Applied-Upstream: 0.1.1
+Bug-Debian: #682931
+
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ bin/freefoam-log.py.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/freefoam-log.py.in b/bin/freefoam-log.py.in
+index 325dcf5..07d18e2 100755
+--- a/bin/freefoam-log.py.in
++++ b/bin/freefoam-log.py.in
+@@ -323,7 +323,7 @@ tLen = max(map(len, time))
+ for n, v in data.items():
+    for i in xrange(len(v)):
+       f = open(os.path.join(logsDir, '%s_%d'%(n, i)), 'wt')
+-      for j in xrange(len(time)):
++      for j in range(min(len(time), len(v[i]))):
+          if not noTime:
+             f.write(('%-'+str(tLen)+'s  ')%time[j])
+          f.write('%s\n'%v[i][j])
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 3fc6fae..3ac6443 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ update-for-removed-apps.diff
 missing-qualifications-of-template-dependent-names.diff
 doxygen-generated-file-names-breakage.diff
 fix-api-doc-location.diff
+handle-truncated-logs-in-freefoam-log.diff

-- 
Freefoam packaging. Programs and libraries for Computational Fluid Dynamics (CFD)



More information about the debian-science-commits mailing list