[ARVADOS] updated: bc816b50fc16182fef2f5d17ffd61578432e83c3

git at public.curoverse.com git at public.curoverse.com
Tue Oct 13 22:29:38 EDT 2015


Summary of changes:
 tools/keep-rsync/keep-rsync.go | 6 ++++++
 1 file changed, 6 insertions(+)

       via  bc816b50fc16182fef2f5d17ffd61578432e83c3 (commit)
      from  6141682d816511814fb59fae4cdb5cf6090e735f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bc816b50fc16182fef2f5d17ffd61578432e83c3
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 13 22:27:41 2015 -0400

    7167: when the config file does not contain '/', use $HOME/.config/arvados/<filename>.

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index bdfcb27..9f14a9e 100644
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -11,6 +11,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"regexp"
 	"strings"
 	"time"
@@ -109,7 +110,12 @@ var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$")
 
 // Read config from file
 func readConfigFromFile(filename string) (config arvadosclient.APIConfig, blobSigningKey string, err error) {
+	if !strings.Contains(filename, "/") {
+		filename = os.Getenv("HOME") + "/.config/arvados/" + filename
+	}
+
 	content, err := ioutil.ReadFile(filename)
+
 	if err != nil {
 		return config, "", err
 	}

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list