diff options
author | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-06-01 12:16:43 -0400 |
---|---|---|
committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-06-01 12:16:43 -0400 |
commit | 8fc1017d809c69943f0257902e4e408fc7b47cb9 (patch) | |
tree | bf0618f082c31f34e15d4de097f0ecf733177a7b /source/merge.d | |
parent | 5505aa564eb741d6f024a176f9674db459b6a958 (diff) | |
download | dm-8fc1017d809c69943f0257902e4e408fc7b47cb9.tar.gz |
Refactor creation/test procedure
Diffstat (limited to 'source/merge.d')
-rw-r--r-- | source/merge.d | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/merge.d b/source/merge.d index 72805d6..528582c 100644 --- a/source/merge.d +++ b/source/merge.d @@ -55,7 +55,7 @@ string[string][] dmfile(string[] packages) { bool env_combine(ref Session_t session, ref Conda conda) { if (indexOf(session.base_spec, "://", 0) < 0 && !session.base_spec.exists) { - throw new Exception(session.base_spec~ " does not exist"); + throw new Exception(session.base_spec ~ " does not exist"); } int retval = 0; @@ -67,7 +67,7 @@ bool env_combine(ref Session_t session, ref Conda conda) { return false; } - conda.activate(session.delivery); + //conda.activate(session.delivery); writeln("Delivery merge specification:"); foreach (record; dmfile(session.conda_requirements)) { @@ -78,7 +78,7 @@ bool env_combine(ref Session_t session, ref Conda conda) { specs ~= record["fullspec"]; } - if (conda.run("install " ~ conda.multiarg("-c", conda.channels) + if (conda.run("install -n " ~ session.delivery ~ " " ~ conda.multiarg("-c", conda.channels) ~ " " ~ safe_install(specs))) { return false; } |