global: Add global 'canonicalize' command

Also accept 'canonicalise' for both global and xsa commands.

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

diff --git a/global.go b/global.go
index 78d7f29e3a4c28914b996bc7ebc5c807ff83c619..7029b87d52ae91175c8d8e09f2d419e216d43001 100644 (file)
--- a/global.go
+++ b/global.go
@@ -78,6 +78,24 @@ func MainGlobalUpdate(unused *XSAMeta, args []string) int {
        return 0
 }
 
+func MainGlobalCanonicalize(unused *XSAMeta, args []string) int {
+       sm := &G.config.Security
+
+       err := sm.Load()
+       if err != nil {
+               fmt.Printf("Error loading global metadata: %v\n", err)
+               return 1
+       }
+
+       err = sm.Save()
+       if err != nil {
+               fmt.Printf("Error saving global metadata: %v\n", err)
+               return 1
+       }
+
+       return 0
+}
+
 func MainGlobalInfo(unused *XSAMeta, args []string) int {
        return 0
 }

diff --git a/main.go b/main.go
index e01b5cdcb97833e36b6a33aede7c0e2db7b11edd..5230e4129a1c95d0971576a73aa9e53d1fc2b362 100644 (file)
--- a/main.go
+++ b/main.go
@@ -140,7 +140,7 @@ func XsaMain(args []string) int {
                        checkXSARepos = false
                case "dedup-patches":
                        main = MainDedupPatches
-               case "canonicalize":
+               case "canonicalize", "canonicalise":
                        main = MainCanonicalize
                default:
                        fmt.Printf("Unknown command: %s\n", cmd)
@@ -168,6 +168,8 @@ func XsaMain(args []string) int {
                                main = MainGlobalUpdate
                        case "info":
                                main = MainGlobalInfo
+                       case "canonicalize", "canonicalise":
+                               main = MainGlobalCanonicalize
                        default:
                                fmt.Printf("Unknown command: %s\n", cmd)
                                return 1