kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-08-12 04:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Fatal() in cmd/

Browse Source
This commit is contained in:
Ettore Di Giacinto 2019-11-04 10:16:20 +01:00
parent 0307b1faad
commit 24a6de3f29
No known key found for this signature in database
GPG Key ID: 1ADA699B145A2D1C
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/convert.go
View File

@ -15,7 +15,6 @@
package cmd package cmd
import ( import (
"os"
"runtime" "runtime"
. "github.com/mudler/luet/pkg/logger" . "github.com/mudler/luet/pkg/logger"
@ -36,8 +35,7 @@ var convertCmd = &cobra.Command{
c := viper.GetInt("concurrency") c := viper.GetInt("concurrency")
if len(args) != 2 { if len(args) != 2 {
Error("Incorrect number of arguments") Fatal("Incorrect number of arguments")
os.Exit(1)
} }
input := args[0] input := args[0]
@ -54,8 +52,7 @@ var convertCmd = &cobra.Command{
packageTree, err := builder.Generate(input) packageTree, err := builder.Generate(input)
if err != nil { if err != nil {
Error("Error: " + err.Error()) Fatal("Error: " + err.Error())
os.Exit(1)
} }
defer packageTree.GetPackageSet().Clean() defer packageTree.GetPackageSet().Clean()
@ -67,8 +64,7 @@ var convertCmd = &cobra.Command{
generalRecipe.WithTree(packageTree) generalRecipe.WithTree(packageTree)
err = generalRecipe.Save(output) err = generalRecipe.Save(output)
if err != nil { if err != nil {
Error("Error: " + err.Error()) Fatal("Error: " + err.Error())
os.Exit(1)
} }
}, },
} }

15
cmd/query.go
View File

@ -17,7 +17,8 @@ package cmd
import ( import (
"fmt" "fmt"
"log" "log"
"os"
. "github.com/mudler/luet/pkg/logger"
pkg "github.com/mudler/luet/pkg/package" pkg "github.com/mudler/luet/pkg/package"
"github.com/mudler/luet/pkg/solver" "github.com/mudler/luet/pkg/solver"
@ -44,8 +45,7 @@ var queryCmd = &cobra.Command{
err := generalRecipe.Load(input) err := generalRecipe.Load(input)
if err != nil { if err != nil {
fmt.Println("Error: " + err.Error()) Fatal("Error: " + err.Error())
os.Exit(1)
} }
defer generalRecipe.Tree().GetPackageSet().Clean() defer generalRecipe.Tree().GetPackageSet().Clean()
@ -60,15 +60,13 @@ var queryCmd = &cobra.Command{
// Tree caches generated world when using FindPackage // Tree caches generated world when using FindPackage
pack, err := generalRecipe.Tree().FindPackage(&pkg.DefaultPackage{Category: cat, Name: v, Version: version}) pack, err := generalRecipe.Tree().FindPackage(&pkg.DefaultPackage{Category: cat, Name: v, Version: version})
if err != nil { if err != nil {
fmt.Println("Error: " + err.Error()) Fatal("Error: " + err.Error())
os.Exit(1)
} }
fmt.Println("Install query from " + input + " [" + v + "]") fmt.Println("Install query from " + input + " [" + v + "]")
world, err := generalRecipe.Tree().World() world, err := generalRecipe.Tree().World()
if err != nil { if err != nil {
fmt.Println("Error: " + err.Error()) Fatal("Error: " + err.Error())
os.Exit(1)
} }
fmt.Println(">>> World") fmt.Println(">>> World")
for _, packss := range world { for _, packss := range world {
@ -77,8 +75,7 @@ var queryCmd = &cobra.Command{
s := solver.NewSolver([]pkg.Package{}, world) s := solver.NewSolver([]pkg.Package{}, world)
solution, err := s.Install([]pkg.Package{pack}) solution, err := s.Install([]pkg.Package{pack})
if err != nil { if err != nil {
fmt.Println("Error: " + err.Error()) Fatal("Error: " + err.Error())
os.Exit(1)
} }
fmt.Println(">>> Solution") fmt.Println(">>> Solution")