Merge pull request #119 from achilleas-k/identities-only

LGTM

Author: mpsonntag

debdock/debian/changelog

@@ -1,4 +1,16 @@
-gin-cli (0.9) beta; urgency=low
+gin-cli (0.11); urgency=low
+
+  * Release 0.11
+  * Fixed issue where some git implementations would continuously try to use
+    the user's key insted of the one generated by gin (macOS).
+
+gin-cli (0.10); urgency=low
+
+  * Release 0.10
+  * Minor bug fixes and improvements.
+  * Improved the performance of `gin ls` when querying specific files.
+
+gin-cli (0.9); urgency=low
 
   * Release 0.9
   * Automatically add files to git and git annex based on size.

debdock/debian/control

@@ -1,5 +1,5 @@
 Package: gin-cli
-Version: 0.9
+Version: {version}
 Section: base
 Priority: optional
 Architecture: amd64

dorelease.py

@@ -243,8 +243,6 @@ def debianize(binfiles, annexsa_archive):
             # /opt/gin/bin/gin.sh (shell script for running gin cmds)
             # /usr/local/gin -> /opt/gin/bin/gin.sh (symlink)
 
-            # TODO: Update Debian control file version automatically
-
             # create directory structure
             pkgname = "gin-cli"
             pkgnamever = "{}-{}".format(pkgname, VERSION["version"])
@@ -279,6 +277,15 @@ def debianize(binfiles, annexsa_archive):
             shutil.copy(os.path.join(debmdsrc, "changelog"), docdir)
             shutil.copy(os.path.join(debmdsrc, "changelog.Debian"), docdir)
 
+            # TODO: Update changelog automatically
+            # Adding version number to debian control file
+            controlpath = os.path.join(debcapdir, "control")
+            with open(controlpath) as controlfile:
+                controllines = controlfile.read().format(**VERSION)
+
+            with open(controlpath, "w") as controlfile:
+                controlfile.write(controllines)
+
             # gzip changelog and changelog.Debian
             cmd = [
                 "gzip", "--best",

gin-client/repos.go

@@ -200,22 +200,21 @@ func (gincl *Client) RmContent(filepaths []string) error {
 // Returns the name of the directory in which the repository is cloned.
 func (gincl *Client) CloneRepo(repoPath string) (string, error) {
 	util.LogWrite("CloneRepo")
+	err := gincl.LoadToken()
+	if err != nil {
+		return "", err
+	}
 
 	_, repoName := splitRepoParts(repoPath)
 	fmt.Printf("Fetching repository '%s'... ", repoPath)
-	err := gincl.Clone(repoPath)
+	err = gincl.Clone(repoPath)
 	if err != nil {
 		return "", err
 	}
 	green.Println("OK")
 
 	fmt.Printf("Initialising local storage... ")
 
-	err = gincl.LoadToken()
-	if err != nil {
-		return "", err
-	}
-
 	// Following shell commands performed from within the repository root
 	Workingdir = repoName
 	hostname, err := os.Hostname()

util/keygen.go

@@ -67,7 +67,7 @@ func PrivKeyPath(user string) string {
 // AnnexSSHOpt returns a formatted string that can be used in git-annex commands that should
 // make use of the user's private key.
 func AnnexSSHOpt(user string) string {
-	return fmt.Sprintf("annex.ssh-options=-o StrictHostKeyChecking=no -i %s", PrivKeyPath(user))
+	return fmt.Sprintf("annex.ssh-options=-o IdentitiesOnly=yes -o StrictHostKeyChecking=no -i %s", PrivKeyPath(user))
 }
 
 // GitSSHOpt returns a formatted string that can be used in git commands that should make
@@ -86,5 +86,7 @@ func GitSSHEnv(user string) string {
 	sshbin = strings.Replace(sshbin, ossep, "/", -1)
 	keyfile := PrivKeyPath(user)
 	keyfile = strings.Replace(keyfile, ossep, "/", -1)
-	return fmt.Sprintf("GIT_SSH_COMMAND=%s -i %s -o StrictHostKeyChecking=no", sshbin, keyfile)
+	gitSSHCmd := fmt.Sprintf("GIT_SSH_COMMAND=%s -i %s -o IdentitiesOnly=yes -o StrictHostKeyChecking=no", sshbin, keyfile)
+	LogWrite("Added to env: %s", gitSSHCmd)
+	return gitSSHCmd
 }