[med-svn] r17686 - trunk/packages/qiime/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2014-08-11 14:28:51 +0000 (Mon, 11 Aug 2014)
New Revision: 17686

Modified:
   trunk/packages/qiime/trunk/debian/patches/prevent_download_on_builds.patch
Log:
Prevent download when building


Modified: trunk/packages/qiime/trunk/debian/patches/prevent_download_on_builds.patch
===================================================================
--- trunk/packages/qiime/trunk/debian/patches/prevent_download_on_builds.patch	2014-08-11 13:41:14 UTC (rev 17685)
+++ trunk/packages/qiime/trunk/debian/patches/prevent_download_on_builds.patch	2014-08-11 14:28:51 UTC (rev 17686)
@@ -1,10 +1,20 @@
-Author: Tim Booth <tbooth at ceh.ac.uk>
-Last-Update: Mon, 10 Mar 2014 14:20:08 +0000
+Author: Tim Booth <tbooth at ceh.ac.uk>, Andreas Tille <tille at debian.org>
+Last-Update: Wed, 22 Jan 2014 08:51:45 +0100
 Description: Do not try to download uclust at build time
 
 --- a/setup.py
 +++ b/setup.py
-@@ -175,13 +175,6 @@ if build_stack:
+@@ -132,6 +132,9 @@ def build_FastTree():
+ def download_UCLUST():
+     """Download the UCLUST executable and set it to the scripts directory"""
+ 
++    print "It is not possible to download anything at package install time."
++    return '/usr/lib/qiime/bin/uclust' # path to installed helper script
++    #  The following lines will be ignored
+     if platform == 'darwin':
+         URL = 'http://www.drive5.com/uclust/uclustq1.2.22_i86darwin64'
+     elif platform == 'linux2':
+@@ -175,13 +178,6 @@ if build_stack:
      else:
          print "GHC not installed, so cannot build the Denoiser binary."