vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-05 22:08:27 +00:00
Code Issues Projects Releases Wiki Activity

Refactoring: build pool path in Package. #8

Browse Source
This commit is contained in:
Andrey Smirnov
2014-04-22 16:20:51 +04:00
parent 45335da0ed
commit 1bac201687
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
files/public.go
View File

@@ -47,34 +47,29 @@ func (storage *PublishedStorage) RemoveDirs(path string) error {
// LinkFromPool links package file from pool to dist's pool location
//
// prefix is publishing prefix for this repo (e.g. empty or "ppa/")
// component is component name when publishing (e.g. main)
// poolDirectory is desired location in pool (like liba/libav/)
// publishedDirectory is desired location in pool (like prefix/pool/component/liba/libav/)
// sourcePool is instance of aptly.PackagePool
// sourcePath is filepath to package file in package pool
//
// LinkFromPool returns relative path for the published file to be included in package index
func (storage *PublishedStorage) LinkFromPool(prefix string, component string, poolDirectory string, sourcePool aptly.PackagePool, sourcePath string) (string, error) {
func (storage *PublishedStorage) LinkFromPool(publishedDirectory string, sourcePool aptly.PackagePool, sourcePath string) error {
// verify that package pool is local pool is filesystem pool
_ = sourcePool.(*PackagePool)
baseName := filepath.Base(sourcePath)
relPath := filepath.Join("pool", component, poolDirectory, baseName)
poolPath := filepath.Join(storage.rootPath, prefix, "pool", component, poolDirectory)
poolPath := filepath.Join(storage.rootPath, publishedDirectory)
err := os.MkdirAll(poolPath, 0755)
if err != nil {
return "", err
return err
}
_, err = os.Stat(filepath.Join(poolPath, baseName))
if err == nil { // already exists, skip
return relPath, nil
return nil
}
err = os.Link(sourcePath, filepath.Join(poolPath, baseName))
return relPath, err
return os.Link(sourcePath, filepath.Join(poolPath, baseName))
}
// ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path