diff options
| author | rillig <rillig@pkgsrc.org> | 2019-10-03 18:28:29 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-10-03 18:28:29 +0000 |
| commit | 783b96b549f7092d926f20d95952290c383d5c7e (patch) | |
| tree | 50b895f7c02ec3d568a0ba2ff286d50cdd8c6351 /pkgtools/url2pkg | |
| parent | 1034229541a3f7337925f7d54f45a8a5b799a649 (diff) | |
| download | pkgsrc-783b96b549f7092d926f20d95952290c383d5c7e.tar.gz | |
pkgtools/url2pkg: ignore commented variables
Diffstat (limited to 'pkgtools/url2pkg')
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.py | 6 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg_test.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgtools/url2pkg/files/url2pkg.py b/pkgtools/url2pkg/files/url2pkg.py index ffdd692b10b..ef6474136d5 100644 --- a/pkgtools/url2pkg/files/url2pkg.py +++ b/pkgtools/url2pkg/files/url2pkg.py @@ -1,5 +1,5 @@ #! @PYTHONBIN@ -# $NetBSD: url2pkg.py,v 1.5 2019/10/03 16:43:58 rillig Exp $ +# $NetBSD: url2pkg.py,v 1.6 2019/10/03 18:28:29 rillig Exp $ # Copyright (c) 2019 The NetBSD Foundation, Inc. # All rights reserved. @@ -386,7 +386,7 @@ class Lines: string. """ varassign = self.unique_varassign(varname) - return varassign.value if varassign is not None else '' + return varassign.value if varassign is not None and varassign.varname == varname else '' def remove_if(self, varname: str, expected_value: str) -> bool: """ Removes a variable assignment if its value is the expected one. """ @@ -775,7 +775,7 @@ class Adjuster: lines = Lines(*self.makefile_lines.lines[: marker_index]) - if lines.index(r'^PKGNAME=') == -1: + if lines.get('PKGNAME=') == '': distname_index = lines.index(r'^DISTNAME=(\t+)') if distname_index != -1: pkgname_line = 'PKGNAME=\t%s${DISTNAME%s}' % (self.pkgname_prefix, self.pkgname_transform) diff --git a/pkgtools/url2pkg/files/url2pkg_test.py b/pkgtools/url2pkg/files/url2pkg_test.py index 92e0bb8e0be..628bee3323d 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.4 2019/10/03 16:43:58 rillig Exp $ +# $NetBSD: url2pkg_test.py,v 1.5 2019/10/03 18:28:29 rillig Exp $ from url2pkg import * @@ -250,12 +250,14 @@ def test_Lines_get(): lines = Lines( "VAR=value", "VAR=\tvalue # comment", - "UNIQUE=\tunique" + "UNIQUE=\tunique", + "#COMMENTED=\tvalue", ) assert lines.get("VAR") == "" # too many values assert lines.get("ENOENT") == "" # no value at all assert lines.get("UNIQUE") == "unique" + assert lines.get("COMMENTED") == "" # commented out def test_generate_initial_package_Makefile_lines__GitHub_archive(): |