# HG changeset patch -- Bitbucket.org # Project galaxy-dist # URL http://bitbucket.org/galaxy/galaxy-dist/overview # User Kelly Vincent <kpvincent@bx.psu.edu> # Date 1277488422 14400 # Node ID d666e89f178eddb4175c388e81d8758096de72df # Parent 7c27ca4b9431ae6eda0c4e9835b195876a2bd159 Fixed a bug in column_join where it failed when only two files were being joined --- a/tools/new_operations/column_join.py +++ b/tools/new_operations/column_join.py @@ -157,11 +157,8 @@ def __main__(): inputs = [ options.input1, options.input2 ] if options.fill_options_file == "None": inputs.extend( args ) - else: - try: - col = int( args[0] ) - except ValueError: - inputs.extend( args ) + elif len( args ) > 0: + inputs.extend( args ) fill_options = None if options.fill_options_file != "None" and options.fill_options_file is not None: try: