[med-svn] [Git][med-team/consensuscore][master] Fix build by filtering out items from list that are None

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / consensuscore


Commits:
71a110fb by Andreas Tille at 2019-12-09T13:00:04Z
Fix build by filtering out items from list that are None

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/check_boost_version.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -5,7 +5,6 @@ consensuscore (1.1.1+dfsg-2) UNRELEASED; urgency=medium
   * Add myself to Uploaders
   * debhelper-compat 12
   * Standards-Version: 4.4.1
-  TODO: Does not build
 
  -- Andreas Tille <tille at debian.org>  Sat, 07 Dec 2019 12:44:55 +0100
 


=====================================
debian/patches/check_boost_version.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Filter out items from list that are None
+Bug-Debian: https://bugs.debian.org/936328
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 07 Dec 2019 12:44:55 +0100
+
+--- a/tools/find_boost
++++ b/tools/find_boost
+@@ -38,8 +38,12 @@ def find_boost():
+         glob("/opt/local/include/boost/")  + \
+         glob("/opt/local/include/boost*/")
+ 
+-    boosts_found = [ (boost, boost_version(boost))
+-                     for boost in boost_candidates ]
++    boosts_found_all = [ (boost, boost_version(boost))
++                         for boost in boost_candidates ]
++    boosts_found = []
++    for bf in boosts_found_all:
++        if not bf[1] == None:
++            boosts_found.append(bf)
+     if boosts_found:
+         best_boost = max(boosts_found, key=lambda t: t[1])[0]
+         return best_boost


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ spelling.patch
 compiler-flags.patch
 gcc-6.patch
 2to3.patch
+check_boost_version.patch



View it on GitLab: https://salsa.debian.org/med-team/consensuscore/commit/71a110fb2d306cd85e0eb7133a1626f6b0428797

-- 
View it on GitLab: https://salsa.debian.org/med-team/consensuscore/commit/71a110fb2d306cd85e0eb7133a1626f6b0428797
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191209/db681133/attachment-0001.html>