diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-07-05 21:01:00 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2019-07-06 00:08:02 +0300 |
| commit | c19eb253d32f1bb2789b8b6108e9314354be0b37 (patch) | |
| tree | 12896dbaa6fa7eb2c37b037df8fcf665db7e888c | |
| parent | ebaee1379ea105d2f19e43187d58def9f4bae6d8 (diff) | |
Always mark source packages as skip
| -rwxr-xr-x | calm/package.py | 5 | ||||
| -rw-r--r-- | test/testdata/uploads/pkglist.expected | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/calm/package.py b/calm/package.py index ccca563..3d5f810 100755 --- a/calm/package.py +++ b/calm/package.py @@ -411,7 +411,10 @@ def read_one_package(packages, p, relpath, dirpath, files, remove, kind): packages[pn].tars = actual_tars packages[pn].hints = hints packages[pn].pkgpath = pkgpath - packages[pn].skip = any(['skip' in version_hints[vr] for vr in version_hints]) + if kind == Kind.source: + packages[pn].skip = True + else: + packages[pn].skip = any(['skip' in version_hints[vr] for vr in version_hints]) packages[pn].kind = kind # since we are kind of inventing the source package names, and don't # want to report them, keep track of the real name diff --git a/test/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected index 5595a50..a928e8d 100644 --- a/test/testdata/uploads/pkglist.expected +++ b/test/testdata/uploads/pkglist.expected @@ -13,7 +13,7 @@ 'Bézier."', 'category': 'Devel', 'requires': 'cygwin', - 'depends': 'cygwin'}}, {}, False), + 'depends': 'cygwin'}}, {}, True), 'testpackage-subpackage': Package('testpackage/testpackage-subpackage', {'1.0-1': {'testpackage-subpackage-1.0-1.tar.bz2': Tar('testpackage-subpackage-1.0-1.tar.bz2', 'x86/release/testpackage/testpackage-subpackage', 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}}, {'1.0-1': {'sdesc': '"A test subpackage"', 'ldesc': '"A test subpackage"', 'category': 'Devel', |