Skip to content

Fix wrong nil check for SkipBz2 #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randombenj merged 3 commits into from
Aug 16, 2022
Merged

Fix wrong nil check for SkipBz2 #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e724d7
Fix wrong nil check for SkipBz2
randombenj Aug 11, 2022
6df9724
Fix golangci-lint
randombenj Aug 11, 2022
51ad7be
Fix mirror test
randombenj Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
go generate

- name: golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: v1.45.0

Expand Down
2 changes: 1 addition & 1 deletion api/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
}

published.SkipBz2 = context.Config().SkipBz2Publishing
if b.SkipContents != nil {
if b.SkipBz2 != nil {
published.SkipBz2 = *b.SkipBz2
}

Expand Down
1 change: 0 additions & 1 deletion system/t04_mirror/ShowMirror8Test_gold
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"Label": "Debian-Security",
"Origin": "Debian",
"Suite": "oldoldstable",
"Valid-Until": "Sat, 05 Feb 2022 10:02:07 UTC",
"Version": "9"
},
"LastDownloadDate": "0001-01-01T00:00:00Z",
Expand Down
2 changes: 1 addition & 1 deletion system/t04_mirror/show.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ShowMirror4Test(BaseTest):
runCmd = "aptly mirror show mirror4"

def outputMatchPrepare(self, s):
return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
return re.sub(r"(Date): [,0-9:+A-Za-z -]+\n", "", s)


class ShowMirror5Test(BaseTest):
Expand Down