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

Fix bugs with prefix/storage parsing. #15

Browse Source
This commit is contained in:
Andrey Smirnov
2014-07-22 00:27:49 +04:00
parent 71d90947c9
commit 52bb33dc69
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/context.go
View File

@@ -210,9 +210,9 @@ func (context *AptlyContext) GetPublishedStorage(name string) aptly.PublishedSto
if name == "" { if name == "" {
publishedStorage = files.NewPublishedStorage(context.Config().RootDir) publishedStorage = files.NewPublishedStorage(context.Config().RootDir)
} else if strings.HasPrefix(name, "s3:") { } else if strings.HasPrefix(name, "s3:") {
params, ok := context.Config().S3PublishRoots[name[4:]] params, ok := context.Config().S3PublishRoots[name[3:]]
if !ok { if !ok {
Fatal(fmt.Errorf("published S3 storage %v not configured", name[4:])) Fatal(fmt.Errorf("published S3 storage %v not configured", name[3:]))
} }
var err error var err error

5
cmd/publish.go
View File

@@ -28,8 +28,11 @@ func getSigner(flags *flag.FlagSet) (utils.Signer, error) {
func parsePrefix(param string) (storage, prefix string) { func parsePrefix(param string) (storage, prefix string) {
i := strings.LastIndex(param, ":") i := strings.LastIndex(param, ":")
if i != -1 { if i != -1 {
storage = param[:i+1] storage = param[:i]
prefix = param[i+1:] prefix = param[i+1:]
if prefix == "" {
prefix = "."
}
} else { } else {
prefix = param prefix = param
} }