2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1a9a6e51304c/ Changeset: 1a9a6e51304c User: dannon Date: 2013-05-28 23:23:17 Summary: Bugfix for standard dataset upload Affected #: 1 file diff -r 79889b1c7da331afc80e2fa64e9d568a9c559cbe -r 1a9a6e51304c95d79322d17c9583afbaf305b25b lib/galaxy/tools/actions/upload_common.py --- a/lib/galaxy/tools/actions/upload_common.py +++ b/lib/galaxy/tools/actions/upload_common.py @@ -209,13 +209,12 @@ trans.sa_session.add( dp ) trans.sa_session.flush() return ldda + def new_upload( trans, cntrller, uploaded_dataset, library_bunch=None, history=None, state=None ): if library_bunch: return __new_library_upload( trans, cntrller, uploaded_dataset, library_bunch, state ) - elif history: + else: return __new_history_upload( trans, uploaded_dataset, history=history, state=state ) - else: - raise Exception("new_upload must be called with empty values for library_bunch and history") def get_uploaded_datasets( trans, cntrller, params, precreated_datasets, dataset_upload_inputs, library_bunch=None, history=None ): uploaded_datasets = [] https://bitbucket.org/galaxy/galaxy-central/commits/8c69611137c1/ Changeset: 8c69611137c1 Branch: next-stable User: dannon Date: 2013-05-28 23:23:17 Summary: Bugfix for standard dataset upload Affected #: 1 file diff -r 6b4b91d27c3316960ae0e65bfb7c87371831be41 -r 8c69611137c19dd59d9e6f7cc339484213a88b18 lib/galaxy/tools/actions/upload_common.py --- a/lib/galaxy/tools/actions/upload_common.py +++ b/lib/galaxy/tools/actions/upload_common.py @@ -209,13 +209,12 @@ trans.sa_session.add( dp ) trans.sa_session.flush() return ldda + def new_upload( trans, cntrller, uploaded_dataset, library_bunch=None, history=None, state=None ): if library_bunch: return __new_library_upload( trans, cntrller, uploaded_dataset, library_bunch, state ) - elif history: + else: return __new_history_upload( trans, uploaded_dataset, history=history, state=state ) - else: - raise Exception("new_upload must be called with empty values for library_bunch and history") def get_uploaded_datasets( trans, cntrller, params, precreated_datasets, dataset_upload_inputs, library_bunch=None, history=None ): uploaded_datasets = [] 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.