NixOS · Oct 24, 2019 · Oct 24, 2019 · Oct 28, 2019 · Oct 29, 2019
Showing with 5 additions and 4 deletions.

+1 −1 nixops/script_defs.py

+3 −2 nixops/ssh_util.py

+1 −1 release.nix
diff --git a/nixops/script_defs.py b/nixops/script_defs.py
@@ -711,7 +711,7 @@ def op_copy_closure(args):
         raise Exception("unknown machine ‘{0}’".format(machine))
     env = dict(os.environ)
     env['NIX_SSHOPTS'] = ' '.join(m.get_ssh_flags())
-    res = subprocess.call(
+    res = nixops.util.logged_exec(
         ["nix", "copy", "--to",
             "ssh://{}".format(m.get_ssh_name()), args.storepath],
         env=env)

diff --git a/nixops/ssh_util.py b/nixops/ssh_util.py
@@ -48,9 +48,10 @@ def __init__(self, target, logger, ssh_flags, passwd, user, compress=False):
                '-oNumberOfPasswordPrompts={0}'.format(pass_prompts),
                '-oServerAliveInterval=60',
                '-oControlPersist=600'] \
-              + (["-C"] if compress else [])
+              + (["-C"] if compress else []) \
+              + ssh_flags
 
-        res = subprocess.call(cmd + ssh_flags, **kwargs)
+        res = nixops.util.logged_exec(cmd, logger, **kwargs)
         if res != 0:
             raise SSHConnectionFailed(
                 "unable to start SSH master connection to "

diff --git a/release.nix b/release.nix
@@ -6,7 +6,7 @@
 
 let
   pkgs = import nixpkgs { config = {}; overlays = []; };
-  version = "1.7" + (if officialRelease then "" else "pre${toString nixopsSrc.revCount}_${nixopsSrc.shortRev}");
+  version = "1.8" + (if officialRelease then "" else "pre${toString nixopsSrc.revCount}_${nixopsSrc.shortRev}");
 
   allPlugins = let
     plugins = let