Remove old Lmap from datatypes_conf.xml.sample - now deprecated from genetics.py

Causing buildbot to barf.

datatypes_conf.xml.sample

@@ -194,7 +194,6 @@
         <!-- genome graphs ucsc file - first col is always marker then numeric values to plot -->
         <datatype extension="gg" type="galaxy.datatypes.genetics:GenomeGraphs"/>
         <!-- part of linkage format pedigree -->
-        <datatype extension="lmap" type="galaxy.datatypes.genetics:Lmap" display_in_upload="true"/>
         <datatype extension="malist" type="galaxy.datatypes.genetics:MAlist" display_in_upload="true"/>
         <!-- linkage format pedigree (separate .map file) -->
         <datatype extension="lped" type="galaxy.datatypes.genetics:Lped" display_in_upload="true">

lib/galaxy/web/controllers/library_common.py

@@ -1111,7 +1111,7 @@ class LibraryCommon( BaseController ):
                 # is composite - must return a zip of contents and the html file itself - ugh - should be reversible at upload!
                 # use act_on_multiple_datasets( self, trans, cntrller, library_id, ldda_ids='', **kwd ) since it does what we need
                 kwd['do_action'] = 'zip'
-                return self.act_on_multiple_datasets( trans, cntrller, library_id, ldda_ids=id, **kwd )
+                return self.act_on_multiple_datasets( trans, cntrller, library_id, ldda_ids=[id,], **kwd )
             else:
                 mime = trans.app.datatypes_registry.get_mimetype_by_extension( ldda.extension.lower() )
                 trans.response.set_content_type( mime )
@@ -1258,6 +1258,7 @@ class LibraryCommon( BaseController ):
             messagetype = 'error'
         else:
             ldda_ids = util.listify( ldda_ids )
+	    log.debug('## act on multiple got %s' % ldda_ids)
             if action == 'import_to_history':
                 history = trans.get_history()
                 if history is None:

run_functional_tests.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # A good place to look for nose info: http://somethingaboutorange.com/mrl/projects/nose/
-
+export PATH=/usr/local/bin:$PATH
 rm -f run_functional_tests.log 
 
 if [ ! $1 ]; then