commit/galaxy-central: 3 new changesets
3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b94303434f03/ Changeset: b94303434f03 User: kell...@gmail.com Date: 2014-10-05 05:01:12+00:00 Summary: Fixing how docker_util.__docker_prefix sets the host information Affected #: 1 file diff -r e7708503e1aacf07dfbbd3fa116de5bd54353b17 -r b94303434f031569a3484edb14e5d1b7a29c36d5 lib/galaxy/tools/deps/docker_util.py --- a/lib/galaxy/tools/deps/docker_util.py +++ b/lib/galaxy/tools/deps/docker_util.py @@ -59,6 +59,7 @@ ): inspect_command_parts = __docker_prefix(docker_cmd, sudo, sudo_cmd, host) inspect_command_parts.extend(["inspect", image]) + print inspect_command_parts inspect_image_command = " ".join(inspect_command_parts) pull_command_parts = __docker_prefix(docker_cmd, sudo, sudo_cmd, host) @@ -116,5 +117,5 @@ command_parts.append(sudo_cmd) command_parts.append(docker_cmd) if host: - command_parts.append(["-H", host]) + command_parts.extend(["-H", host]) return command_parts https://bitbucket.org/galaxy/galaxy-central/commits/4aca849f229f/ Changeset: 4aca849f229f User: kell...@gmail.com Date: 2014-10-05 05:05:38+00:00 Summary: Removing stray print statement Affected #: 1 file diff -r b94303434f031569a3484edb14e5d1b7a29c36d5 -r 4aca849f229f538770376d091fac30e4a76854a8 lib/galaxy/tools/deps/docker_util.py --- a/lib/galaxy/tools/deps/docker_util.py +++ b/lib/galaxy/tools/deps/docker_util.py @@ -59,7 +59,6 @@ ): inspect_command_parts = __docker_prefix(docker_cmd, sudo, sudo_cmd, host) inspect_command_parts.extend(["inspect", image]) - print inspect_command_parts inspect_image_command = " ".join(inspect_command_parts) pull_command_parts = __docker_prefix(docker_cmd, sudo, sudo_cmd, host) https://bitbucket.org/galaxy/galaxy-central/commits/b42fee58bc40/ Changeset: b42fee58bc40 User: jmchilton Date: 2014-10-06 01:35:01+00:00 Summary: Merged in kellrott/galaxy-farm (pull request #515) Fixing how docker_utils.__docker_prefix adds host info to command line Affected #: 1 file diff -r 3aa7288f5a97970df22fd38c400237028fe33e4b -r b42fee58bc402de82fb4667baa575cb81ab55f4b lib/galaxy/tools/deps/docker_util.py --- a/lib/galaxy/tools/deps/docker_util.py +++ b/lib/galaxy/tools/deps/docker_util.py @@ -116,5 +116,5 @@ command_parts.append(sudo_cmd) command_parts.append(docker_cmd) if host: - command_parts.append(["-H", host]) + command_parts.extend(["-H", host]) return command_parts 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)
-
commits-noreply@bitbucket.org