فهرست منبع

Merge pull request #927 from Morganamilo/fix#926

Update go-srcinfo
J Guerreiro 6 سال پیش
والد
کامیت
a75506cc34
5فایلهای تغییر یافته به همراه8 افزوده شده و 5 حذف شده
  1. 1 1
      go.mod
  2. 2 0
      go.sum
  3. 3 3
      vendor/github.com/Morganamilo/go-srcinfo/parser.go
  4. 1 0
      vendor/github.com/Morganamilo/go-srcinfo/srcinfo.go
  5. 1 1
      vendor/modules.txt

+ 1 - 1
go.mod

@@ -2,7 +2,7 @@ module github.com/Jguer/yay/v9
 
 require (
 	github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f
-	github.com/Morganamilo/go-srcinfo v0.0.0-20180702014333-368edc79b2c5
+	github.com/Morganamilo/go-srcinfo v1.0.0
 	github.com/jguer/go-alpm v0.0.0-20190302211415-9c82d5170ce0
 	github.com/mikkeloscar/aur v0.0.0-20181111113612-b71516da3ae9
 )

+ 2 - 0
go.sum

@@ -2,6 +2,8 @@ github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f h1:ptFKy
 github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f/go.mod h1:Hk55m330jNiwxRodIlMCvw5iEyoRUCIY64W1p9D+tHc=
 github.com/Morganamilo/go-srcinfo v0.0.0-20180702014333-368edc79b2c5 h1:0mWTtDLD9MmZO8Qk21aRFfsQpGU3uS7mSLbSzDTuguY=
 github.com/Morganamilo/go-srcinfo v0.0.0-20180702014333-368edc79b2c5/go.mod h1:MP6VGY1NNpVUmYIEgoM9acix95KQqIRyqQ0hCLsyYUY=
+github.com/Morganamilo/go-srcinfo v1.0.0 h1:Wh4nEF+HJWo+29hnxM18Q2hi+DUf0GejS13+Wg+dzmI=
+github.com/Morganamilo/go-srcinfo v1.0.0/go.mod h1:MP6VGY1NNpVUmYIEgoM9acix95KQqIRyqQ0hCLsyYUY=
 github.com/jguer/go-alpm v0.0.0-20180914002751-643c287316a5 h1:JPIXUHXLZYwYUTlGpCCRMNFt8IRAyLPUsnXYqOJ6U/w=
 github.com/jguer/go-alpm v0.0.0-20180914002751-643c287316a5/go.mod h1:1F60/e8oQFVJrZRH0TBqwtiB5ajJ5avOc4MoGRY9CFU=
 github.com/jguer/go-alpm v0.0.0-20181021002825-676ad6bbf3c0 h1:MtH4SM1pw+23QhMERYK38DyGNqf6F3zUhxeKmQhuHC0=

+ 3 - 3
vendor/github.com/Morganamilo/go-srcinfo/parser.go

@@ -21,7 +21,7 @@ func (psr *parser) currentPackage() (*Package, error) {
 	} else if len(psr.srcinfo.Packages) == 0 {
 		return &psr.srcinfo.Package, nil
 	} else {
-		return &psr.srcinfo.Packages[len(psr.srcinfo.Packages) - 1], nil
+		return &psr.srcinfo.Packages[len(psr.srcinfo.Packages)-1], nil
 	}
 }
 
@@ -115,6 +115,8 @@ func (psr *parser) setField(archKey, value string) error {
 		pkgbase.SHA384Sums = append(pkgbase.SHA384Sums, ArchString{arch, value})
 	case "sha512sums":
 		pkgbase.SHA512Sums = append(pkgbase.SHA512Sums, ArchString{arch, value})
+	case "b2sums":
+		pkgbase.B2Sums = append(pkgbase.B2Sums, ArchString{arch, value})
 	case "makedepends":
 		pkgbase.MakeDepends = append(pkgbase.MakeDepends, ArchString{arch, value})
 	case "checkdepends":
@@ -172,8 +174,6 @@ func (psr *parser) setField(archKey, value string) error {
 		pkg.Provides = append(pkg.Provides, ArchString{arch, value})
 	case "replaces":
 		pkg.Replaces = append(pkg.Replaces, ArchString{arch, value})
-	default:
-		return fmt.Errorf("Unknown key: \"%s\"", archKey)
 	}
 
 	return nil

+ 1 - 0
vendor/github.com/Morganamilo/go-srcinfo/srcinfo.go

@@ -56,6 +56,7 @@ type PackageBase struct {
 	SHA256Sums   []ArchString
 	SHA384Sums   []ArchString
 	SHA512Sums   []ArchString
+	B2Sums       []ArchString
 	MakeDepends  []ArchString
 	CheckDepends []ArchString
 }

+ 1 - 1
vendor/modules.txt

@@ -1,7 +1,7 @@
 # github.com/Morganamilo/go-pacmanconf v0.0.0-20180910220353-9c5265e1b14f
 github.com/Morganamilo/go-pacmanconf
 github.com/Morganamilo/go-pacmanconf/ini
-# github.com/Morganamilo/go-srcinfo v0.0.0-20180702014333-368edc79b2c5
+# github.com/Morganamilo/go-srcinfo v1.0.0
 github.com/Morganamilo/go-srcinfo
 # github.com/jguer/go-alpm v0.0.0-20190302211415-9c82d5170ce0
 github.com/jguer/go-alpm