🎨 Cleanups

cmd/root.go

@@ -30,7 +30,7 @@ var cfgFile string
 var Verbose bool
 
 const (
-	LuetCLIVersion = "0.32.3"
+	LuetCLIVersion = "0.32.1"
 	LuetEnvPrefix  = "LUET"
 )
 

pkg/api/core/logger/logger.go

@@ -17,7 +17,6 @@ package logger
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"regexp"
 	"runtime"
@@ -255,7 +254,7 @@ func (l *Logger) Tracef(t string, args ...interface{}) {
 
 func (l *Logger) Fatal(args ...interface{}) {
 	l.send(log.LevelFatal, "", args...)
-	os.Exit(2)
+	panic("fatal error")
 }
 
 func (l *Logger) Info(args ...interface{}) {

pkg/installer/finalizer.go

@@ -95,27 +95,6 @@ func NewLuetFinalizerFromYaml(data []byte) (*LuetFinalizer, error) {
 
 func OrderFinalizers(allRepos types.PackageDatabase, toInstall map[string]ArtifactMatch, solution types.PackagesAssertions) ([]*types.Package, error) {
 	var toFinalize []*types.Package
-
-	populate := func(ordered types.PackagesAssertions) error {
-		for _, ass := range ordered {
-			if ass.Value {
-				installed, ok := toInstall[ass.Package.GetFingerPrint()]
-				if !ok {
-					// It was a dep already installed in the system, so we can skip it safely
-					continue
-				}
-				treePackage, err := installed.Repository.GetTree().GetDatabase().FindPackage(ass.Package)
-				if err != nil {
-					return errors.Wrap(err, "Error getting package "+ass.Package.HumanReadableString())
-				}
-
-				toFinalize = append(toFinalize, treePackage)
-				return nil
-			}
-		}
-		return nil
-	}
-
 	if len(toInstall) == 1 {
 		for _, w := range toInstall {
 			if fileHelper.Exists(w.Package.Rel(tree.FinalizerFile)) {
@@ -124,8 +103,21 @@ func OrderFinalizers(allRepos types.PackageDatabase, toInstall map[string]Artifa
 				if err != nil {
 					return toFinalize, errors.Wrap(err, "While order a solution for "+w.Package.HumanReadableString())
 				}
-				if err := populate(ordered); err != nil {
-					return toFinalize, err
+			ORDER:
+				for _, ass := range ordered {
+					if ass.Value {
+						installed, ok := toInstall[ass.Package.GetFingerPrint()]
+						if !ok {
+							// It was a dep already installed in the system, so we can skip it safely
+							continue ORDER
+						}
+						treePackage, err := installed.Repository.GetTree().GetDatabase().FindPackage(ass.Package)
+						if err != nil {
+							return toFinalize, errors.Wrap(err, "Error getting package "+ass.Package.HumanReadableString())
+						}
+
+						toFinalize = append(toFinalize, treePackage)
+					}
 				}
 			}
 		}
@@ -135,8 +127,10 @@ func OrderFinalizers(allRepos types.PackageDatabase, toInstall map[string]Artifa
 			return toFinalize, err
 		}
 
-		if err := populate(assertions); err != nil {
-			return toFinalize, err
+		for _, o := range assertions {
+			if o.Value {
+				toFinalize = append(toFinalize, o.Package)
+			}
 		}
 	}
 

pkg/installer/repository.go

@@ -457,14 +457,6 @@ func (r *LuetSystemRepository) SetVerify(p bool) {
 	r.LuetRepository.Verify = p
 }
 
-func (r *LuetSystemRepository) GetReferenceID() string {
-	return r.LuetRepository.ReferenceID
-}
-
-func (r *LuetSystemRepository) SetReferenceID(ref string) {
-	r.LuetRepository.ReferenceID = ref
-}
-
 func (r *LuetSystemRepository) GetBackend() compiler.CompilerBackend {
 	return r.Backend
 }
@@ -1059,7 +1051,6 @@ func (r *LuetSystemRepository) fill(r2 *LuetSystemRepository) {
 	r2.SetPriority(r.GetPriority())
 	r2.SetName(r.GetName())
 	r2.SetVerify(r.GetVerify())
-	r2.SetReferenceID(r.GetReferenceID())
 }
 
 func (r *LuetSystemRepository) Serialize() (*LuetSystemRepositoryMetadata, LuetSystemRepository) {