diff options
| author | rillig <rillig@pkgsrc.org> | 2021-05-23 16:27:39 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2021-05-23 16:27:39 +0000 |
| commit | 3babda2e670f06c6ebd53c342ae52d5bebd86925 (patch) | |
| tree | ff0727f574747d1448230f22709790b8c4cd3432 /pkgtools | |
| parent | 948833e69cc677ade0d08ffecdd4e09c082ab911 (diff) | |
| download | pkgsrc-3babda2e670f06c6ebd53c342ae52d5bebd86925.tar.gz | |
url2pkg: update to 21.1.0
Changes since 20.4.0:
Fixed handling of GitHub archive URLs with extra slashes, such as
https://github.com/org/proj/archive/refs/tags/1.0.0.tar.gz.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.py | 9 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg_test.py | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 60eb1c8693a..01be817cff4 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.117 2020/12/28 01:48:19 rillig Exp $ +# $NetBSD: Makefile,v 1.118 2021/05/23 16:27:39 rillig Exp $ -PKGNAME= url2pkg-20.4.0 +PKGNAME= url2pkg-21.1.0 CATEGORIES= pkgtools MAINTAINER= rillig@NetBSD.org diff --git a/pkgtools/url2pkg/files/url2pkg.py b/pkgtools/url2pkg/files/url2pkg.py index 77313a58baf..c866e163b85 100644 --- a/pkgtools/url2pkg/files/url2pkg.py +++ b/pkgtools/url2pkg/files/url2pkg.py @@ -1,5 +1,5 @@ #! @PYTHONBIN@ -# $NetBSD: url2pkg.py,v 1.28 2020/10/17 22:39:01 rillig Exp $ +# $NetBSD: url2pkg.py,v 1.29 2021/05/23 16:27:39 rillig Exp $ # Copyright (c) 2019 The NetBSD Foundation, Inc. # All rights reserved. @@ -410,7 +410,8 @@ class Generator: https://github\.com/ (.+)/ # org (.+)/archive/ # proj - (.+) # tag + ((?:.+/)? # tag + (.+)) # distname (\.tar\.gz|\.zip) # ext $ ''' @@ -418,7 +419,7 @@ class Generator: if not m: return - org, proj, tag, ext = m.groups() + org, proj, tag, distname, ext = m.groups() self.github_project = proj self.github_tag = tag @@ -427,7 +428,7 @@ class Generator: if proj not in tag: self.pkgname_prefix = '${GITHUB_PROJECT}-' self.dist_subdir = '${GITHUB_PROJECT}' - self.distfile = tag + ext + self.distfile = distname + ext def adjust_site_GitHub_release(self): pattern = r'''(?x) diff --git a/pkgtools/url2pkg/files/url2pkg_test.py b/pkgtools/url2pkg/files/url2pkg_test.py index 09d284be8a3..914addce329 100644 --- a/pkgtools/url2pkg/files/url2pkg_test.py +++ b/pkgtools/url2pkg/files/url2pkg_test.py @@ -1,4 +1,4 @@ -# $NetBSD: url2pkg_test.py,v 1.28 2021/05/23 16:20:46 rillig Exp $ +# $NetBSD: url2pkg_test.py,v 1.29 2021/05/23 16:27:39 rillig Exp $ import pytest from url2pkg import * @@ -440,8 +440,7 @@ def test_Generator_adjust_site_GitHub_archive_tag(): '', 'GITHUB_PROJECT= proj', 'GITHUB_TAG= refs/tags/1.0.0', - # FIXME: DISTNAME must not contain slashes - 'DISTNAME= refs/tags/1.0.0', + 'DISTNAME= 1.0.0', 'PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}', 'CATEGORIES= pkgtools', 'MASTER_SITES= ${MASTER_SITE_GITHUB:=org/}', |