From 83a195e96a8a5b232b5b4e279c0a02623e1979b5 Mon Sep 17 00:00:00 2001
From: Uday Verma <uday.karan@gmail.com>
Date: Sun, 25 May 2014 19:23:07 -0500
Subject: [PATCH] Fix move command logging, config to control IPv6 usage

---
 config.example.json       | 1 +
 src/dakait/config.clj     | 1 +
 src/dakait/downloader.clj | 1 +
 src/dakait/staging.clj    | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config.example.json b/config.example.json
index 444c3d7..e9b129f 100644
--- a/config.example.json
+++ b/config.example.json
@@ -2,6 +2,7 @@
   "config-data-dir": "/change/this/to/some/dir",
   "sftp-host": "sftp.example.com",
   "sftp-port": 22,
+  "use-ipv6": false,
   "username": "guest",
   "private-key": "/path/to/private/key",
   "base-path": "./some/dir",
diff --git a/src/dakait/config.clj b/src/dakait/config.clj
index 4d545c1..e9535db 100644
--- a/src/dakait/config.clj
+++ b/src/dakait/config.clj
@@ -8,6 +8,7 @@
 (def defaults { :server-name "Server"
                 :sftp-port 22
                 :concurrency 4
+                :use-ipv6 false
                 :local-base-path "."
                 :username (System/getProperty "user.name")
                 :push-path "."
diff --git a/src/dakait/downloader.clj b/src/dakait/downloader.clj
index 44b9cff..7d2078a 100644
--- a/src/dakait/downloader.clj
+++ b/src/dakait/downloader.clj
@@ -48,6 +48,7 @@
         os-dest (os-proof dest)
         scp-command (list "scp"
                           "-i" (config :private-key) ;; identity file
+                          (if (config :use-ipv6) "-6" "-4") ;; use appropriate flag to force IP version selection
                           "-B" ;; batch run
                           "-r" ;; recursive if directory
                           "-o" "StrictHostKeyChecking=no"
diff --git a/src/dakait/staging.clj b/src/dakait/staging.clj
index 3932f10..61163bf 100644
--- a/src/dakait/staging.clj
+++ b/src/dakait/staging.clj
@@ -52,7 +52,8 @@
   (.mkdirs (io/file dest))
   (with-programs [mv]
     (info "Moving " src " -> " dest)
-    (mv src dest {:verbose true})))
+    (let [r (mv src dest {:verbose true})]
+      (info "Move status: " r))))
 
 (defn stage-file
   "Helps stage the file, triggers download of the file to the staged configuration area, once the