commit/galaxy-central: dan: Allow upload to function on https URLs.
1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/425076fe5ea0/ changeset: r5220:425076fe5ea0 user: dan date: 2011-03-15 04:01:11 summary: Allow upload to function on https URLs. affected #: 2 files (142 bytes) --- a/lib/galaxy/tools/parameters/grouping.py Fri Mar 11 17:54:06 2011 -0500 +++ b/lib/galaxy/tools/parameters/grouping.py Mon Mar 14 23:01:11 2011 -0400 @@ -218,12 +218,12 @@ url_paste_file = group_incoming.get( 'url_paste', None ) if url_paste_file is not None: url_paste = open( url_paste_file, 'r' ).read( 1024 ) - if url_paste.lstrip().lower().startswith( 'http://' ) or url_paste.lstrip().lower().startswith( 'ftp://' ): + if url_paste.lstrip().lower().startswith( 'http://' ) or url_paste.lstrip().lower().startswith( 'ftp://' ) or url_paste.lstrip().lower().startswith( 'https://' ): url_paste = url_paste.replace( '\r', '' ).split( '\n' ) for line in url_paste: line = line.strip() if line: - if not line.lower().startswith( 'http://' ) and not line.lower().startswith( 'ftp://' ): + if not line.lower().startswith( 'http://' ) and not line.lower().startswith( 'ftp://' ) and not line.lower().startswith( 'https://' ): continue # non-url line, ignore precreated_name = line dataset_name = override_name --- a/lib/galaxy/web/controllers/tool_runner.py Fri Mar 11 17:54:06 2011 -0500 +++ b/lib/galaxy/web/controllers/tool_runner.py Mon Mar 14 23:01:11 2011 -0400 @@ -237,7 +237,7 @@ line = line.rstrip( '\r\n' ).strip() if not line: continue - elif line.lower().startswith( 'http://' ) or line.lower().startswith( 'ftp://' ): + elif line.lower().startswith( 'http://' ) or line.lower().startswith( 'ftp://' ) or line.lower().startswith( 'https://' ): url = True datasets.append( create_dataset( line ) ) else: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket