vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-26 13:47:40 +00:00
Code Issues Projects Releases Wiki Activity

rename addon files to skel files

Browse Source
This commit is contained in:
Mauro Regli
2023-05-31 07:39:29 +02:00
committed by André Roth
parent 03f189b62c
commit 1357d246d8
9 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/index_files.go
+2 -2
View File
@@ -389,8 +389,8 @@ func (files *indexFiles) LegacyContentsIndex(arch string, udeb bool) *indexFile
return file
}
func (files *indexFiles) AddonIndex(component, path string) *indexFile {
key := fmt.Sprintf("ai-%s-%s", component, path)
func (files *indexFiles) SkelIndex(component, path string) *indexFile {
key := fmt.Sprintf("si-%s-%s", component, path)
file, ok := files.indexes[key]
if !ok {
deb/publish.go
+12 -12
View File
@@ -773,16 +773,16 @@ func (p *PublishedRepo) GetCodename() string {
return p.Codename
}
// GetAddonFiles returns a map of files to be added to a repo. Key being the relative
// GetSkelFiles returns a map of files to be added to a repo. Key being the relative
// path from component folder, and value being the full local FS path.
func (p *PublishedRepo) GetAddonFiles(addonDir string, component string) (map[string]string, error) {
func (p *PublishedRepo) GetSkelFiles(skelDir string, component string) (map[string]string, error) {
files := make(map[string]string)
if addonDir == "" {
if skelDir == "" {
return files, nil
}
fsPath := filepath.Join(addonDir, p.Prefix, "dists", p.Distribution, component)
fsPath := filepath.Join(skelDir, p.Prefix, "dists", p.Distribution, component)
if err := filepath.Walk(fsPath, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
@@ -813,7 +813,7 @@ func (p *PublishedRepo) GetAddonFiles(addonDir string, component string) (map[st
// Publish publishes snapshot (repository) contents, links package files, generates Packages & Release files, signs them
func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageProvider aptly.PublishedStorageProvider,
collectionFactory *CollectionFactory, signer pgp.Signer, progress aptly.Progress, forceOverwrite, addonDirectory string) error {
collectionFactory *CollectionFactory, signer pgp.Signer, progress aptly.Progress, forceOverwrite, skelDir string) error {
publishedStorage := publishedStorageProvider.GetPublishedStorage(p.Storage)
err := publishedStorage.MkDir(filepath.Join(p.Prefix, "pool"))
@@ -1023,25 +1023,25 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
}
for component := range p.sourceItems {
addonFiles, err := p.GetAddonFiles(addonDirectory, component)
skelFiles, err := p.GetSkelFiles(skelDir, component)
if err != nil {
return fmt.Errorf("unable to get addon files: %v", err)
return fmt.Errorf("unable to get skeleton files: %v", err)
}
for relPath, absPath := range addonFiles {
bufWriter, err := indexes.AddonIndex(component, relPath).BufWriter()
for relPath, absPath := range skelFiles {
bufWriter, err := indexes.SkelIndex(component, relPath).BufWriter()
if err != nil {
return fmt.Errorf("unable to generate addon index: %v", err)
return fmt.Errorf("unable to generate skeleton index: %v", err)
}
file, err := os.Open(absPath)
if err != nil {
return fmt.Errorf("unable to read addon file: %v", err)
return fmt.Errorf("unable to read skeleton file: %v", err)
}
_, err = bufio.NewReader(file).WriteTo(bufWriter)
if err != nil {
return fmt.Errorf("unable to write addon file: %v", err)
return fmt.Errorf("unable to write skeleton file: %v", err)
}
}
}