main: Call OpenRepos when loading config

Rather than having to open them each place they're used.

Also do some minor reorganization of variables, just code motion.

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

diff --git a/main.go b/main.go
index 61c0f02c7dacaa815e65da99b7280b2bdecb84d0..d564b97ef3783966e833d730155f9d7dea1e8ff3 100644 (file)
--- a/main.go
+++ b/main.go
@@ -64,26 +64,26 @@ func globalReset() {
 }
 
 func XsaMain(args []string) int {
-       var xsa XSAMeta
-       var main MainFunc
+       if len(args) < 3 {
+               fmt.Printf("Not enough arguments\n")
+               return 1
+       }
 
        globalReset()
 
+       var xsa XSAMeta
+       var main MainFunc
+       var err error
+       var xsanum int
+
        loadConfig := false
        loadXSA := false
 
-       if len(args) < 3 {
-               fmt.Printf("Not enough arguments\n")
-               return 1
-       }
-
        tgt := args[1]
        args = args[2:]
        cmd := args[0]
        args = args[1:]
 
-       var err error
-       var xsanum int
        if xsanum, err = strconv.Atoi(tgt); err == nil {
                switch cmd {
                case "new":
@@ -154,11 +154,15 @@ func XsaMain(args []string) int {
        }
 
        if loadConfig {
-               err := G.config.Tool.Load()
-               if err != nil {
+               if err := G.config.Tool.Load(); err != nil {
                        fmt.Printf("Error finding config: %v\n", err)
                        return 1
                }
+
+               if err := OpenRepos(); err != nil {
+                       fmt.Printf("Error opening repos: %v\n", err)
+                       return 1
+               }
        }
 
        if loadXSA {

diff --git a/repo.go b/repo.go
index dd20ef273429ac0a94b35c2b28c0bd325f2140c3..95dcc0cd8f6a9c3ce29e2d57683ca89dffeb9760 100644 (file)
--- a/repo.go
+++ b/repo.go
@@ -154,12 +154,6 @@ func MainRepoInfo(unused *XSAMeta, args []string) (ret int) {
 }
 
 func MainRepoX(unused *XSAMeta, args []string) (ret int) {
-       err := OpenRepos()
-       if err != nil {
-               fmt.Printf("Error opening repos: %v\n", err)
-               return 1
-       }
-
        versions, err := G.repos.XenRepos[TreeXen].GetVersions()
 
        if err != nil {

diff --git a/test.go b/test.go
index e59412af630c594d7a37f832167f449c3872b716..5180b3bd249094e8707c5d8c83e34078688ed3ad 100644 (file)
--- a/test.go
+++ b/test.go
@@ -87,34 +87,13 @@ func test(xsa *XSAMeta, args []string, apply bool, build bool) (ret int) {
 }
 
 func MainTestApply(xsa *XSAMeta, args []string) (ret int) {
-
-       err := OpenRepos()
-       if err != nil {
-               fmt.Printf("Error initializing repos: %v\n", err)
-               return 1
-       }
-
        return test(xsa, args, true, false)
 }
 
 func MainTestBuild(xsa *XSAMeta, args []string) (ret int) {
-
-       err := OpenRepos()
-       if err != nil {
-               fmt.Printf("Error initializing repos: %v\n", err)
-               return 1
-       }
-
        return test(xsa, args, false, true)
 }
 
 func MainTest(xsa *XSAMeta, args []string) (ret int) {
-
-       err := OpenRepos()
-       if err != nil {
-               fmt.Printf("Error initializing repos: %v\n", err)
-               return 1
-       }
-
        return test(xsa, args, true, true)
 }

diff --git a/xsa.go b/xsa.go
index ce33f96e348923805f57afb1ee395b13ee4b3e51..9a7bdffdb7c09b035bb4a85fe7f3ba4b2480ca0d 100644 (file)
--- a/xsa.go
+++ b/xsa.go
@@ -5,12 +5,6 @@ import (
 )
 
 func sync(xsa *XSAMeta, args []string, sync bool) (ret int) {
-       err := OpenRepos()
-       if err != nil {
-               fmt.Printf("Error initializing repos: %v\n", err)
-               return 1
-       }
-
        vers := VersionsFromArgs(xsa, args)
 
        if !sync && len(vers) > 1 {
@@ -117,12 +111,6 @@ func MainNewRecipe(xsa *XSAMeta, args []string) (ret int) {
                }
        }
 
-       err = OpenRepos()
-       if err != nil {
-               fmt.Printf("Opening repos: %v\n", err)
-               return 1
-       }
-
        // FIXME: Deal with prerequisites
 
        // Make appropriate branches (including prerequisites)