vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-16 12:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade gin-gonic to latest master, fix compatibility issues

Browse Source
This commit is contained in:
Andrey Smirnov
2017-09-28 00:33:59 +03:00
parent ff8e4a8659
commit 3756db2491
282 changed files with 71226 additions and 3160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/publish.go
+26 -26
View File
@@ -77,7 +77,7 @@ func apiPublishList(c *gin.Context) {
})
if err != nil {
c.Fail(500, err)
c.AbortWithError(500, err)
return
}
@@ -106,18 +106,18 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
Signing SigningOptions
}
if !c.Bind(&b) {
if c.Bind(&b) != nil {
return
}
signer, err := getSigner(&b.Signing)
if err != nil {
c.Fail(500, fmt.Errorf("unable to initialize GPG signer: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to initialize GPG signer: %s", err))
return
}
if len(b.Sources) == 0 {
c.Fail(400, fmt.Errorf("unable to publish: soures are empty"))
c.AbortWithError(400, fmt.Errorf("unable to publish: soures are empty"))
return
}
@@ -136,13 +136,13 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
snapshot, err = snapshotCollection.ByName(source.Name)
if err != nil {
c.Fail(404, fmt.Errorf("unable to publish: %s", err))
c.AbortWithError(404, fmt.Errorf("unable to publish: %s", err))
return
}
err = snapshotCollection.LoadComplete(snapshot)
if err != nil {
c.Fail(500, fmt.Errorf("unable to publish: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to publish: %s", err))
return
}
@@ -160,19 +160,19 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
localRepo, err = localCollection.ByName(source.Name)
if err != nil {
c.Fail(404, fmt.Errorf("unable to publish: %s", err))
c.AbortWithError(404, fmt.Errorf("unable to publish: %s", err))
return
}
err = localCollection.LoadComplete(localRepo)
if err != nil {
c.Fail(500, fmt.Errorf("unable to publish: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to publish: %s", err))
}
sources = append(sources, localRepo)
}
} else {
c.Fail(400, fmt.Errorf("unknown SourceKind"))
c.AbortWithError(400, fmt.Errorf("unknown SourceKind"))
return
}
@@ -182,7 +182,7 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
published, err := deb.NewPublishedRepo(storage, prefix, b.Distribution, b.Architectures, components, sources, context.CollectionFactory())
if err != nil {
c.Fail(500, fmt.Errorf("unable to publish: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to publish: %s", err))
return
}
if b.Origin != "" {
@@ -204,19 +204,19 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
duplicate := collection.CheckDuplicate(published)
if duplicate != nil {
context.CollectionFactory().PublishedRepoCollection().LoadComplete(duplicate, context.CollectionFactory())
c.Fail(400, fmt.Errorf("prefix/distribution already used by another published repo: %s", duplicate))
c.AbortWithError(400, fmt.Errorf("prefix/distribution already used by another published repo: %s", duplicate))
return
}
err = published.Publish(context.PackagePool(), context, context.CollectionFactory(), signer, nil, b.ForceOverwrite)
if err != nil {
c.Fail(500, fmt.Errorf("unable to publish: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to publish: %s", err))
return
}
err = collection.Add(published)
if err != nil {
c.Fail(500, fmt.Errorf("unable to save to DB: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to save to DB: %s", err))
return
}
@@ -240,13 +240,13 @@ func apiPublishUpdateSwitch(c *gin.Context) {
}
}
if !c.Bind(&b) {
if c.Bind(&b) != nil {
return
}
signer, err := getSigner(&b.Signing)
if err != nil {
c.Fail(500, fmt.Errorf("unable to initialize GPG signer: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to initialize GPG signer: %s", err))
return
}
@@ -265,12 +265,12 @@ func apiPublishUpdateSwitch(c *gin.Context) {
published, err := collection.ByStoragePrefixDistribution(storage, prefix, distribution)
if err != nil {
c.Fail(404, fmt.Errorf("unable to update: %s", err))
c.AbortWithError(404, fmt.Errorf("unable to update: %s", err))
return
}
err = collection.LoadComplete(published, context.CollectionFactory())
if err != nil {
c.Fail(500, fmt.Errorf("unable to update: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to update: %s", err))
return
}
@@ -278,7 +278,7 @@ func apiPublishUpdateSwitch(c *gin.Context) {
if published.SourceKind == deb.SourceLocalRepo {
if len(b.Snapshots) > 0 {
c.Fail(400, fmt.Errorf("snapshots shouldn't be given when updating local repo"))
c.AbortWithError(400, fmt.Errorf("snapshots shouldn't be given when updating local repo"))
return
}
updatedComponents = published.Components()
@@ -289,19 +289,19 @@ func apiPublishUpdateSwitch(c *gin.Context) {
publishedComponents := published.Components()
for _, snapshotInfo := range b.Snapshots {
if !utils.StrSliceHasItem(publishedComponents, snapshotInfo.Component) {
c.Fail(404, fmt.Errorf("component %s is not in published repository", snapshotInfo.Component))
c.AbortWithError(404, fmt.Errorf("component %s is not in published repository", snapshotInfo.Component))
return
}
snapshot, err2 := snapshotCollection.ByName(snapshotInfo.Name)
if err != nil {
c.Fail(404, err2)
c.AbortWithError(404, err2)
return
}
err2 = snapshotCollection.LoadComplete(snapshot)
if err2 != nil {
c.Fail(500, err2)
c.AbortWithError(500, err2)
return
}
@@ -309,7 +309,7 @@ func apiPublishUpdateSwitch(c *gin.Context) {
updatedComponents = append(updatedComponents, snapshotInfo.Component)
}
} else {
c.Fail(500, fmt.Errorf("unknown published repository type"))
c.AbortWithError(500, fmt.Errorf("unknown published repository type"))
return
}
@@ -319,13 +319,13 @@ func apiPublishUpdateSwitch(c *gin.Context) {
err = published.Publish(context.PackagePool(), context, context.CollectionFactory(), signer, nil, b.ForceOverwrite)
if err != nil {
c.Fail(500, fmt.Errorf("unable to update: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to update: %s", err))
return
}
err = collection.Update(published)
if err != nil {
c.Fail(500, fmt.Errorf("unable to save to DB: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to save to DB: %s", err))
return
}
@@ -333,7 +333,7 @@ func apiPublishUpdateSwitch(c *gin.Context) {
err = collection.CleanupPrefixComponentFiles(published.Prefix, updatedComponents,
context.GetPublishedStorage(storage), context.CollectionFactory(), nil)
if err != nil {
c.Fail(500, fmt.Errorf("unable to update: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to update: %s", err))
return
}
}
@@ -362,7 +362,7 @@ func apiPublishDrop(c *gin.Context) {
err := collection.Remove(context, storage, prefix, distribution,
context.CollectionFactory(), context.Progress(), force, skipCleanup)
if err != nil {
c.Fail(500, fmt.Errorf("unable to drop: %s", err))
c.AbortWithError(500, fmt.Errorf("unable to drop: %s", err))
return
}