bubble-package-manager/bpm
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: Readd source package compilation functionality #11

Draft
EnumDev wants to merge 33 commits from readd_source_packages into develop
pull from: readd_source_packages
merge into: bubble-package-manager:develop
Conversation 0 Commits 33 Files Changed 17 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 966d351a80 - Show all commits

3
src/bpmlib/compilation.go
View File

@ -264,8 +264,7 @@ func CompileSourcePackage(archiveFilename, outputDirectory string, skipChecks bo
pkgInfo.Arch = GetArch()
}
// Remove source package specific fields
pkgInfo.MakeDepends = nil
// Remove split package field
pkgInfo.SplitPackages = nil
// Marshal package info

3
src/bpmlib/packages.go
View File

@ -466,8 +466,7 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) {
pkgInfoClone := *pkgInfo
pkgInfo.SplitPackages[i] = &pkgInfoClone
// Set make depends and split package field of split package to nil
pkgInfo.SplitPackages[i].MakeDepends = nil
// Set split package field of split package to nil
pkgInfo.SplitPackages[i].SplitPackages = nil
// Unmarshal json data back to struct