[SCM] zynjacku/master: debian/patches/0013-hangs_on_missing_license_field.patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Mar 9 21:56:40 UTC 2011


The following commit has been merged in the master branch:
commit 212b919776333020b8d3681f544eb648c52615a3
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 9 22:55:39 2011 +0100

    debian/patches/0013-hangs_on_missing_license_field.patch.
    
    Prevent hang when the .ttl file lacks the 'license' field.

diff --git a/debian/patches/0013-hangs_on_missing_license_field.patch b/debian/patches/0013-hangs_on_missing_license_field.patch
new file mode 100644
index 0000000..06f9f32
--- /dev/null
+++ b/debian/patches/0013-hangs_on_missing_license_field.patch
@@ -0,0 +1,22 @@
+Description: Fix hang when ttl misses doap:license.
+Author: Peter Nelson <peter at fuzzle.org>
+Origin: http://repo.or.cz/w/zynjacku.git/commitdiff/1f9733b
+---
+ zynworld/lv2.py |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- zynjacku.orig/zynworld/lv2.py
++++ zynjacku/zynworld/lv2.py
+@@ -489,7 +489,11 @@ class LV2DB:
+             return None
+         dest.name = dest.name[0]
+ 
+-        dest.license = info.bySubject[uri][doap + 'license'][0]
++        dest.license = info.getProperty(uri, doap + 'license', optional = True)
++        if len(dest.license):
++            dest.license = dest.license[0]
++        else:
++            dest.license = None
+         dest.classes = info.bySubject[uri]["a"]
+         dest.requiredFeatures = info.getProperty(uri, lv2 + "requiredFeature", optional = True)
+         dest.optionalFeatures = info.getProperty(uri, lv2 + "optionalFeature", optional = True)
diff --git a/debian/patches/series b/debian/patches/series
index 1d6d33f..e4dd238 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,5 @@
 0010-external_gui_cleanup.patch
 0011-check_ui_is_visible.patch
 0012-fix_parsing_lv2rack_cmdline.patch
+0013-hangs_on_missing_license_field.patch
 1001-shebangs.patch

-- 
zynjacku packaging



More information about the pkg-multimedia-commits mailing list