Skip to content

Commit fffdc36

Browse files
ExplodingDragonExplodingDragon
committed
merge from forgejo
1 parent c221fd3 commit fffdc36

File tree

6 files changed

+193
-202
lines changed

6 files changed

+193
-202
lines changed

‎modules/packages/arch/metadata_test.go‎

Lines changed: 49 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"code.gitea.io/gitea/modules/packages"
1616

1717
"github.com/mholt/archiver/v3"
18-
"github.com/stretchr/testify/assert"
18+
"github.com/stretchr/testify/require"
1919
)
2020

2121
func TestParsePackage(t *testing.T) {
@@ -40,23 +40,23 @@ arch = x86_64
4040

4141
// Test .PKGINFO file
4242
pinf, err := fs.Stat("pkginfo")
43-
assert.NoError(t, err)
43+
require.NoError(t, err)
4444

4545
pfile, err := fs.Open("pkginfo")
46-
assert.NoError(t, err)
46+
require.NoError(t, err)
4747

4848
parcname, err := archiver.NameInArchive(pinf, ".PKGINFO", ".PKGINFO")
49-
assert.NoError(t, err)
49+
require.NoError(t, err)
5050

5151
// Test .MTREE file
5252
minf, err := fs.Stat("mtree")
53-
assert.NoError(t, err)
53+
require.NoError(t, err)
5454

5555
mfile, err := fs.Open("mtree")
56-
assert.NoError(t, err)
56+
require.NoError(t, err)
5757

5858
marcname, err := archiver.NameInArchive(minf, ".MTREE", ".MTREE")
59-
assert.NoError(t, err)
59+
require.NoError(t, err)
6060

6161
t.Run("normal archive", func(t *testing.T) {
6262
var buf bytes.Buffer
@@ -71,7 +71,7 @@ arch = x86_64
7171
},
7272
ReadCloser: pfile,
7373
})
74-
assert.NoError(t, errors.Join(pfile.Close(), err))
74+
require.NoError(t, errors.Join(pfile.Close(), err))
7575

7676
err = archive.Write(archiver.File{
7777
FileInfo: archiver.FileInfo{
@@ -80,7 +80,7 @@ arch = x86_64
8080
},
8181
ReadCloser: mfile,
8282
})
83-
assert.NoError(t, errors.Join(mfile.Close(), archive.Close(), err))
83+
require.NoError(t, errors.Join(mfile.Close(), archive.Close(), err))
8484

8585
reader, err := packages.CreateHashedBufferFromReader(&buf)
8686
if err != nil {
@@ -89,32 +89,31 @@ arch = x86_64
8989
defer reader.Close()
9090
_, err = ParsePackage(reader)
9191

92-
assert.NoError(t, err)
92+
require.NoError(t, err)
9393
})
9494

9595
t.Run("missing .PKGINFO", func(t *testing.T) {
9696
var buf bytes.Buffer
9797

9898
archive := archiver.NewTarZstd()
9999
archive.Create(&buf)
100+
require.NoError(t, archive.Close())
100101

101-
assert.NoError(t, archive.Close())
102102
reader, err := packages.CreateHashedBufferFromReader(&buf)
103-
if err != nil {
104-
t.Fatal(err)
105-
}
103+
require.NoError(t, err)
104+
106105
defer reader.Close()
107106
_, err = ParsePackage(reader)
108107

109-
assert.Error(t, err)
110-
assert.Contains(t, err.Error(), ".PKGINFO file not found")
108+
require.Error(t, err)
109+
require.Contains(t, err.Error(), ".PKGINFO file not found")
111110
})
112111

113112
t.Run("missing .MTREE", func(t *testing.T) {
114113
var buf bytes.Buffer
115114

116115
pfile, err := fs.Open("pkginfo")
117-
assert.NoError(t, err)
116+
require.NoError(t, err)
118117

119118
archive := archiver.NewTarZstd()
120119
archive.Create(&buf)
@@ -126,16 +125,15 @@ arch = x86_64
126125
},
127126
ReadCloser: pfile,
128127
})
129-
assert.NoError(t, errors.Join(pfile.Close(), archive.Close(), err))
128+
require.NoError(t, errors.Join(pfile.Close(), archive.Close(), err))
130129
reader, err := packages.CreateHashedBufferFromReader(&buf)
131-
if err != nil {
132-
t.Fatal(err)
133-
}
130+
require.NoError(t, err)
131+
134132
defer reader.Close()
135133
_, err = ParsePackage(reader)
136134

137-
assert.Error(t, err)
138-
assert.Contains(t, err.Error(), ".MTREE file not found")
135+
require.Error(t, err)
136+
require.Contains(t, err.Error(), ".MTREE file not found")
139137
})
140138
}
141139

@@ -161,8 +159,8 @@ makedepend = cmake
161159
backup = usr/bin/paket1
162160
`
163161
p, err := ParsePackageInfo(strings.NewReader(PKGINFO))
164-
assert.NoError(t, err)
165-
assert.Equal(t, Package{
162+
require.NoError(t, err)
163+
require.Equal(t, Package{
166164
Name: "a",
167165
Version: "1-2",
168166
VersionMetadata: VersionMetadata{
@@ -221,7 +219,7 @@ func TestValidatePackageSpec(t *testing.T) {
221219

222220
err := ValidatePackageSpec(&p)
223221

224-
assert.NoError(t, err)
222+
require.NoError(t, err)
225223
})
226224

227225
t.Run("invalid package name", func(t *testing.T) {
@@ -230,8 +228,8 @@ func TestValidatePackageSpec(t *testing.T) {
230228

231229
err := ValidatePackageSpec(&p)
232230

233-
assert.Error(t, err)
234-
assert.Contains(t, err.Error(), "invalid package name")
231+
require.Error(t, err)
232+
require.Contains(t, err.Error(), "invalid package name")
235233
})
236234

237235
t.Run("invalid package base", func(t *testing.T) {
@@ -240,8 +238,8 @@ func TestValidatePackageSpec(t *testing.T) {
240238

241239
err := ValidatePackageSpec(&p)
242240

243-
assert.Error(t, err)
244-
assert.Contains(t, err.Error(), "invalid package base")
241+
require.Error(t, err)
242+
require.Contains(t, err.Error(), "invalid package base")
245243
})
246244

247245
t.Run("invalid package version", func(t *testing.T) {
@@ -250,8 +248,8 @@ func TestValidatePackageSpec(t *testing.T) {
250248

251249
err := ValidatePackageSpec(&p)
252250

253-
assert.Error(t, err)
254-
assert.Contains(t, err.Error(), "invalid package base")
251+
require.Error(t, err)
252+
require.Contains(t, err.Error(), "invalid package base")
255253
})
256254

257255
t.Run("invalid package version", func(t *testing.T) {
@@ -260,8 +258,8 @@ func TestValidatePackageSpec(t *testing.T) {
260258

261259
err := ValidatePackageSpec(&p)
262260

263-
assert.Error(t, err)
264-
assert.Contains(t, err.Error(), "invalid package version")
261+
require.Error(t, err)
262+
require.Contains(t, err.Error(), "invalid package version")
265263
})
266264

267265
t.Run("missing architecture", func(t *testing.T) {
@@ -270,8 +268,8 @@ func TestValidatePackageSpec(t *testing.T) {
270268

271269
err := ValidatePackageSpec(&p)
272270

273-
assert.Error(t, err)
274-
assert.Contains(t, err.Error(), "architecture should be specified")
271+
require.Error(t, err)
272+
require.Contains(t, err.Error(), "architecture should be specified")
275273
})
276274

277275
t.Run("invalid URL", func(t *testing.T) {
@@ -280,8 +278,8 @@ func TestValidatePackageSpec(t *testing.T) {
280278

281279
err := ValidatePackageSpec(&p)
282280

283-
assert.Error(t, err)
284-
assert.Contains(t, err.Error(), "invalid project URL")
281+
require.Error(t, err)
282+
require.Contains(t, err.Error(), "invalid project URL")
285283
})
286284

287285
t.Run("invalid check dependency", func(t *testing.T) {
@@ -290,8 +288,8 @@ func TestValidatePackageSpec(t *testing.T) {
290288

291289
err := ValidatePackageSpec(&p)
292290

293-
assert.Error(t, err)
294-
assert.Contains(t, err.Error(), "invalid check dependency")
291+
require.Error(t, err)
292+
require.Contains(t, err.Error(), "invalid check dependency")
295293
})
296294

297295
t.Run("invalid dependency", func(t *testing.T) {
@@ -300,8 +298,8 @@ func TestValidatePackageSpec(t *testing.T) {
300298

301299
err := ValidatePackageSpec(&p)
302300

303-
assert.Error(t, err)
304-
assert.Contains(t, err.Error(), "invalid dependency")
301+
require.Error(t, err)
302+
require.Contains(t, err.Error(), "invalid dependency")
305303
})
306304

307305
t.Run("invalid make dependency", func(t *testing.T) {
@@ -310,8 +308,8 @@ func TestValidatePackageSpec(t *testing.T) {
310308

311309
err := ValidatePackageSpec(&p)
312310

313-
assert.Error(t, err)
314-
assert.Contains(t, err.Error(), "invalid make dependency")
311+
require.Error(t, err)
312+
require.Contains(t, err.Error(), "invalid make dependency")
315313
})
316314

317315
t.Run("invalid provides", func(t *testing.T) {
@@ -320,8 +318,8 @@ func TestValidatePackageSpec(t *testing.T) {
320318

321319
err := ValidatePackageSpec(&p)
322320

323-
assert.Error(t, err)
324-
assert.Contains(t, err.Error(), "invalid provides")
321+
require.Error(t, err)
322+
require.Contains(t, err.Error(), "invalid provides")
325323
})
326324

327325
t.Run("invalid optional dependency", func(t *testing.T) {
@@ -330,8 +328,8 @@ func TestValidatePackageSpec(t *testing.T) {
330328

331329
err := ValidatePackageSpec(&p)
332330

333-
assert.Error(t, err)
334-
assert.Contains(t, err.Error(), "invalid optional dependency")
331+
require.Error(t, err)
332+
require.Contains(t, err.Error(), "invalid optional dependency")
335333
})
336334

337335
t.Run("invalid optional dependency", func(t *testing.T) {
@@ -340,82 +338,62 @@ func TestValidatePackageSpec(t *testing.T) {
340338

341339
err := ValidatePackageSpec(&p)
342340

343-
assert.Error(t, err)
344-
assert.Contains(t, err.Error(), "backup file contains leading forward slash")
341+
require.Error(t, err)
342+
require.Contains(t, err.Error(), "backup file contains leading forward slash")
345343
})
346344
}
347345

348346
func TestDescString(t *testing.T) {
349347
const pkgdesc = `%FILENAME%
350348
zstd-1.5.5-1-x86_64.pkg.tar.zst
351-
352349
%NAME%
353350
zstd
354-
355351
%BASE%
356352
zstd
357-
358353
%VERSION%
359354
1.5.5-1
360-
361355
%DESC%
362356
Zstandard - Fast real-time compression algorithm
363-
364357
%GROUPS%
365358
dummy1
366359
dummy2
367-
368360
%CSIZE%
369361
401
370-
371362
%ISIZE%
372363
1500453
373-
374364
%MD5SUM%
375365
5016660ef3d9aa148a7b72a08d3df1b2
376-
377366
%SHA256SUM%
378367
9fa4ede47e35f5971e4f26ecadcbfb66ab79f1d638317ac80334a3362dedbabd
379-
380368
%URL%
381369
https://facebook.github.io/zstd/
382-
383370
%LICENSE%
384371
BSD
385372
GPL2
386-
387373
%ARCH%
388374
x86_64
389-
390375
%BUILDDATE%
391376
1681646714
392-
393377
%PACKAGER%
394378
Jelle van der Waa <[email protected]>
395-
396379
%PROVIDES%
397380
libzstd.so=1-64
398-
399381
%DEPENDS%
400382
glibc
401383
gcc-libs
402384
zlib
403385
xz
404386
lz4
405-
406387
%OPTDEPENDS%
407388
dummy3
408389
dummy4
409-
410390
%MAKEDEPENDS%
411391
cmake
412392
gtest
413393
ninja
414-
415394
%CHECKDEPENDS%
416395
dummy5
417396
dummy6
418-
419397
`
420398

421399
md := &Package{
@@ -443,5 +421,5 @@ dummy6
443421
Arch: "x86_64",
444422
},
445423
}
446-
assert.Equal(t, pkgdesc, md.Desc())
424+
require.Equal(t, pkgdesc, md.Desc())
447425
}

‎options/locale/locale_en-US.ini‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3480,16 +3480,15 @@ alpine.repository = Repository Info
34803480
alpine.repository.branches = Branches
34813481
alpine.repository.repositories = Repositories
34823482
alpine.repository.architectures = Architectures
3483-
arch.pacman.helper.gpg = Import gpg public key:
3484-
arch.pacman.helper.gpg.id = Use `gpg --homedir /etc/pacman.d/gnupg --list-keys` list added gpg key id.
3485-
arch.pacman.helper.pacman = For more pacman usage guides, see <a target="_blank" rel="noopener noreferrer" href="%s">pacman wiki</a> or <a target="_blank" rel="noopener noreferrer" href="%s">pacman sign wiki</a> .
3483+
arch.pacman.helper.gpg = Add trust certificate for pacman:
34863484
arch.pacman.repo.multi = %s has the same version in different distributions.
34873485
arch.pacman.repo.multi.item = Configuration for %s
34883486
arch.pacman.conf = Add server with related distribution and architecture to <code>/etc/pacman.conf</code> :
34893487
arch.pacman.sync = Sync package with pacman:
34903488
arch.version.properties = Version Properties
34913489
arch.version.description = Description
34923490
arch.version.provides = Provides
3491+
arch.version.groups = Group
34933492
arch.version.depends = Depends
34943493
arch.version.optdepends = Optional depends
34953494
arch.version.makedepends = Make depends

‎routers/web/user/package.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package user
55

66
import (
7+
"fmt"
78
"net/http"
89
"net/url"
910

@@ -213,6 +214,7 @@ func ViewPackageVersion(ctx *context.Context) {
213214
registryAppURL, _ = url.Parse(setting.AppURL)
214215
}
215216
ctx.Data["RegistryHost"] = registryAppURL.Host
217+
ctx.Data["SignMail"] = fmt.Sprintf("%s@noreply.%s", ctx.Package.Owner.Name, registryAppURL.Host)
216218
groups := make(container.Set[string])
217219
for _, f := range pd.Files {
218220
for _, pp := range f.Properties {

0 commit comments

Comments
 (0)