]> xenbits.xensource.com Git - people/gdunlap/xsatool.git/commitdiff
main: add loadGlobal option
authorGeorge Dunlap <george.dunlap@citrix.com>
Wed, 17 May 2017 16:43:39 +0000 (17:43 +0100)
committerGeorge Dunlap <george.dunlap@citrix.com>
Wed, 17 May 2017 16:51:52 +0000 (17:51 +0100)
To indicate whether a command should try to load the global metadata.

Signed-of-by: George Dunlap <george.dunlap@citrix.com>
main.go

diff --git a/main.go b/main.go
index 3061ee7b3a758f9f43e12ff521854602a24f8e05..780fe35ab30e2b182cf47c1c2fc31cd493ecbbc1 100644 (file)
--- a/main.go
+++ b/main.go
@@ -79,6 +79,7 @@ func XsaMain(args []string) int {
        var xsanum int
 
        loadConfig := false
+       loadGlobal := false
        loadXSA := false
 
        tgt := args[1]
@@ -148,6 +149,7 @@ func XsaMain(args []string) int {
                        main = MainGlobalUpdate
                        loadConfig = true
                case "info":
+                       loadGlobal = true
                        main = MainGlobalInfo
                default:
                        fmt.Printf("Unknown command: %s\n", cmd)
@@ -167,6 +169,13 @@ func XsaMain(args []string) int {
                }
        }
 
+       if loadGlobal {
+               if err := G.config.Security.Load(); err != nil {
+                       fmt.Printf("Error loading global metadata: %v\n", err)
+                       return 1
+               }
+       }
+
        if loadXSA {
                err = xsa.Load(xsanum)
                if err != nil {