From: George Dunlap <george.dunlap@citrix.com>
Date: Fri, 23 Jun 2017 15:56:49 +0000 (+0100)
Subject: Miscelaneous fixes
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=615ef487bd72b959ec71eaea7c779d367e92c5c6;p=people%2Fgdunlap%2Fxsatool

Miscelaneous fixes

Add missing arguments, remove a duplicated stanza

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/recipe.go b/recipe.go
index bd65540..4d03d86 100644
--- a/recipe.go
+++ b/recipe.go
@@ -348,7 +348,7 @@ func (r *Recipe) ApplyPatches(prefix string) (err error) {
 		err = xr.MakeBranch(branch, baseline)
 		if err != nil {
 			return fmt.Errorf("Making tempbranch %s for xenversion %v: %v\n",
-				branch, r.XenVersion)
+				branch, r.XenVersion, err)
 		}
 
 		for _, glob := range tr.Patches {
@@ -495,7 +495,7 @@ func (r *Recipe) Build(prefix string) (err error) {
 		err = xenrepo.MakeBranch(tmpBranch, XenStableBranch(r.XenVersion))
 		if err != nil {
 			return fmt.Errorf("Making tempbranch %s for xenversion %v: %v\n",
-				tmpBranch, r.XenVersion)
+				tmpBranch, r.XenVersion, err)
 		}
 	}
 
diff --git a/repo.go b/repo.go
index 820a3b1..85e45dd 100644
--- a/repo.go
+++ b/repo.go
@@ -134,12 +134,6 @@ func MainRepoInit(unused *XSAMeta, args []string) (ret int) {
 		return 1
 	}
 
-	err = G.config.Tool.Save()
-	if err != nil {
-		fmt.Printf("Trying to save config: %v\n", err)
-		return 1
-	}
-
 	return 0
 }