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 bd65540254be025a1ed512c9878141fbf4045ed8..4d03d86fb4a4528b509cb2308243230ce917bfb4 100644 (file)
--- 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 820a3b123d2dcb8803b5568129b30367cc3ffbed..85e45dd99d642b3ff50fe585e03e69ec2797b7b8 100644 (file)
--- 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
 }