2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/20def6edca59/ Changeset: 20def6edca59 Branch: next-stable User: jmchilton Date: 2014-11-20 16:21:25+00:00 Summary: Merge stable into next-stable. Affected #: 3 files diff -r 30e0e657a607b406b899a88d8612d3b6a6602ed6 -r 20def6edca5958f029beae47b4a5cffc9fae8f3d .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -011c8b2118be778eaf1ba952730ff876d6447ba9 latest_2014.10.06 +acc8d1e2bc88530aa8d8651cf5f88649f6769304 latest_2014.10.06 diff -r 30e0e657a607b406b899a88d8612d3b6a6602ed6 -r 20def6edca5958f029beae47b4a5cffc9fae8f3d lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py +++ b/lib/galaxy/tools/parameters/grouping.py @@ -403,6 +403,7 @@ dataset.warnings = [] dataset.metadata = {} dataset.composite_files = {} + dataset.uuid = None #load metadata files_metadata = context.get( self.metadata_ref, {} ) metadata_name_substition_default_dict = dict( [ ( composite_file.substitute_name_with_metadata, d_type.metadata_spec[ composite_file.substitute_name_with_metadata ].default ) for composite_file in d_type.composite_files.values() if composite_file.substitute_name_with_metadata ] ) diff -r 30e0e657a607b406b899a88d8612d3b6a6602ed6 -r 20def6edca5958f029beae47b4a5cffc9fae8f3d lib/pulsar/client/transport/standard.py --- a/lib/pulsar/client/transport/standard.py +++ b/lib/pulsar/client/transport/standard.py @@ -24,11 +24,13 @@ input = None try: if input_path: - if getsize(input_path): + size = getsize(input_path) + if size: input = open(input_path, 'rb') data = mmap.mmap(input.fileno(), 0, access=mmap.ACCESS_READ) else: data = b"" + request.add_header('Content-Length', str(size)) response = self._url_open(request, data) finally: if input: https://bitbucket.org/galaxy/galaxy-central/commits/81dc20496497/ Changeset: 81dc20496497 User: jmchilton Date: 2014-11-20 16:21:42+00:00 Summary: Merge next-stable into default. Affected #: 3 files diff -r 3ec1e82f0fbde4d2cfb390acb4548474ff48d1a9 -r 81dc204964973c94bdee8631fb806a6214574336 .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -011c8b2118be778eaf1ba952730ff876d6447ba9 latest_2014.10.06 +acc8d1e2bc88530aa8d8651cf5f88649f6769304 latest_2014.10.06 diff -r 3ec1e82f0fbde4d2cfb390acb4548474ff48d1a9 -r 81dc204964973c94bdee8631fb806a6214574336 lib/galaxy/tools/parameters/grouping.py --- a/lib/galaxy/tools/parameters/grouping.py +++ b/lib/galaxy/tools/parameters/grouping.py @@ -403,6 +403,7 @@ dataset.warnings = [] dataset.metadata = {} dataset.composite_files = {} + dataset.uuid = None #load metadata files_metadata = context.get( self.metadata_ref, {} ) metadata_name_substition_default_dict = dict( [ ( composite_file.substitute_name_with_metadata, d_type.metadata_spec[ composite_file.substitute_name_with_metadata ].default ) for composite_file in d_type.composite_files.values() if composite_file.substitute_name_with_metadata ] ) diff -r 3ec1e82f0fbde4d2cfb390acb4548474ff48d1a9 -r 81dc204964973c94bdee8631fb806a6214574336 lib/pulsar/client/transport/standard.py --- a/lib/pulsar/client/transport/standard.py +++ b/lib/pulsar/client/transport/standard.py @@ -24,11 +24,13 @@ input = None try: if input_path: - if getsize(input_path): + size = getsize(input_path) + if size: input = open(input_path, 'rb') data = mmap.mmap(input.fileno(), 0, access=mmap.ACCESS_READ) else: data = b"" + request.add_header('Content-Length', str(size)) response = self._url_open(request, data) finally: if input: 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.