kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-25 14:38:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/build: Now use _gentoo.ParsePackageStr

Browse Source
This commit is contained in:
Daniele Rondina
2019-12-24 15:34:02 +01:00
committed by Ettore Di Giacinto
parent 9db9c1bf19
commit 4c62f714c4
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/build.go
View File

@@ -15,11 +15,12 @@
package cmd package cmd
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"regexp"
"runtime" "runtime"
_gentoo "github.com/Sabayon/pkgs-checker/pkg/gentoo"
"github.com/mudler/luet/pkg/compiler" "github.com/mudler/luet/pkg/compiler"
"github.com/mudler/luet/pkg/compiler/backend" "github.com/mudler/luet/pkg/compiler/backend"
. "github.com/mudler/luet/pkg/logger" . "github.com/mudler/luet/pkg/logger"
@@ -95,15 +96,18 @@ var buildCmd = &cobra.Command{
luetCompiler.SetCompressionType(compiler.CompressionImplementation(compressionType)) luetCompiler.SetCompressionType(compiler.CompressionImplementation(compressionType))
if !all { if !all {
for _, a := range args { for _, a := range args {
decodepackage, err := regexp.Compile(`^([<>]?\~?=?)((([^\/]+)\/)?(?U)(\S+))(-(\d+(\.\d+)*[a-z]?(_(alpha|beta|pre|rc|p)\d*)*(-r\d+)?))?$`) gp, err := _gentoo.ParsePackageStr(a)
if err != nil { if err != nil {
Fatal("Error: " + err.Error()) Fatal("Invalid package string ", a, ": ", err.Error())
} }
packageInfo := decodepackage.FindAllStringSubmatch(a, -1)
category := packageInfo[0][4] pack := &pkg.DefaultPackage{
name := packageInfo[0][5] Name: gp.Name,
version := packageInfo[0][1] + packageInfo[0][7] Version: fmt.Sprintf("%s%s", gp.Version, gp.VersionSuffix),
spec, err := luetCompiler.FromPackage(&pkg.DefaultPackage{Name: name, Category: category, Version: version}) Category: gp.Category,
Uri: make([]string, 0),
}
spec, err := luetCompiler.FromPackage(pack)
if err != nil { if err != nil {
Fatal("Error: " + err.Error()) Fatal("Error: " + err.Error())
} }