Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2016-11-16 17:13:48 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2016-11-16 17:19:12 +0300
commit6f144307b120c8d0ea36089076ffb02c794e22e3 (patch)
tree518bf81edeffc2b8408a2f471e1588c22a38d2cb
parente47a080e98bd884aab57e6137c0eb3d58fbedaaa (diff)
setup.hint always sets stability level hints, even if they are absent
-rwxr-xr-xcalm/package.py2
-rw-r--r--test/testdata/uploads/pkglist.expected6
2 files changed, 4 insertions, 4 deletions
diff --git a/calm/package.py b/calm/package.py
index 84699b1..b77c960 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -180,7 +180,7 @@ def read_package(packages, basedir, dirpath, files, strict=False, remove=[]):
hints = {}
# determine version overrides
- note_absent = ('override.hint' in remove) or ('override.hint' in files)
+ note_absent = ('override.hint' in remove) or ('override.hint' in files) or legacy
if 'override.hint' in files:
# read override.hint
diff --git a/test/testdata/uploads/pkglist.expected b/test/testdata/uploads/pkglist.expected
index f36b2a4..0e4c587 100644
--- a/test/testdata/uploads/pkglist.expected
+++ b/test/testdata/uploads/pkglist.expected
@@ -6,11 +6,11 @@
'Like it’s you’re Markup Language™ Nokogiri’s tool―that '
'Bézier."',
'category': 'Devel',
- 'requires': 'cygwin'}}, {}, False),
+ 'requires': 'cygwin'}}, {'curr': None, 'prev': None, 'test': None}, False),
'testpackage-subpackage': Package('x86/release/testpackage/testpackage-subpackage', {'testpackage-subpackage-1.0-1.tar.bz2': Tar('aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83', 195, False)}, {'1.0-1': {'sdesc': '"A test subpackage"',
'ldesc': '"A test subpackage"',
'category': 'Devel',
- 'external-source': 'testpackage'}}, {}, False),
+ 'external-source': 'testpackage'}}, {'curr': None, 'prev': None, 'test': None}, False),
'testpackage2-subpackage': Package('x86/release/testpackage2/testpackage2-subpackage', {'testpackage2-subpackage-1.0-1.tar.bz2': Tar('6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348', 14, True)}, {'1.0-1': {'sdesc': '"A test subpackage 2"',
'ldesc': '"A test subpackage 2"',
- 'category': 'Devel'}}, {}, False)}
+ 'category': 'Devel'}}, {'curr': None, 'prev': None, 'test': None}, False)}