aboutsummaryrefslogtreecommitdiff
path: root/delivery_merge/cli
diff options
context:
space:
mode:
Diffstat (limited to 'delivery_merge/cli')
-rw-r--r--delivery_merge/cli/merge.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/delivery_merge/cli/merge.py b/delivery_merge/cli/merge.py
index 6cf421e..45adf64 100644
--- a/delivery_merge/cli/merge.py
+++ b/delivery_merge/cli/merge.py
@@ -1,6 +1,11 @@
import os
from ..conda import conda, conda_installer, conda_init_path
-from ..merge import env_combine, testable_packages, integration_test
+from ..merge import (
+ env_combine,
+ testable_packages,
+ integration_test,
+ force_yaml_channels
+)
from argparse import ArgumentParser
@@ -53,6 +58,9 @@ def main():
print("Exporting yaml configuration...")
conda('env', 'export', '-n', name, '--file', yamlfile)
+ print("Fix up yaml channel order...")
+ force_yaml_channels(yamlfile, channels)
+
print("Exporting explicit dump...")
with open(specfile, 'w+') as spec:
proc = conda('list', '--explicit', '-n', name)