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

Use uploaders.json in repo include. #71

Browse Source
This commit is contained in:
Andrey Smirnov
2015-03-20 00:18:12 +03:00
parent cc3f5149c6
commit 54e21afee7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/repo_include.go
+11 -6
View File
@@ -44,6 +44,9 @@ func aptlyRepoInclude(cmd *commander.Command, args []string) error {
uploadersFile := context.Flags().Lookup("uploaders-file").Value.Get().(string) uploadersFile := context.Flags().Lookup("uploaders-file").Value.Get().(string)
if uploadersFile != "" { if uploadersFile != "" {
uploaders, err = deb.NewUploadersFromFile(uploadersFile) uploaders, err = deb.NewUploadersFromFile(uploadersFile)
if err != nil {
return err
}
for i := range uploaders.Rules { for i := range uploaders.Rules {
uploaders.Rules[i].CompiledCondition, err = query.Parse(uploaders.Rules[i].Condition) uploaders.Rules[i].CompiledCondition, err = query.Parse(uploaders.Rules[i].Condition)
@@ -77,12 +80,14 @@ func aptlyRepoInclude(cmd *commander.Command, args []string) error {
continue continue
} }
if uploaders != nil && !uploaders.IsAllowed(changes) { if uploaders != nil {
failedFiles = append(failedFiles, path) if err = uploaders.IsAllowed(changes); err != nil {
reporter.Warning("changes file is not allowed accoring to uploaders config: %s, keys %#v", failedFiles = append(failedFiles, path)
changes.ChangesName, changes.SignatureKeys) reporter.Warning("changes file skipped due to uploaders config: %s, keys %#v: %s",
changes.Cleanup() changes.ChangesName, changes.SignatureKeys, err)
continue changes.Cleanup()
continue
}
} }
err = changes.Prepare() err = changes.Prepare()