[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-25-g9bdd081

[jturney at sourceware dot org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=9bdd081e6dbedbb8e9f4772091ea1d36a58cc421

commit 9bdd081e6dbedbb8e9f4772091ea1d36a58cc421
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Sep 27 13:47:30 2016 +0100

    Actually permit the keep-count and keep-days keys in override.hint
    
    The processing of them was implemented, but not the parsing...


Diff:
---
 calm/hint.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/calm/hint.py b/calm/hint.py
index 68abbd7..cf0d94a 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -62,6 +62,11 @@ versionkeys = {
     'test': 'val',
 }
 
+overridekeys = {
+    'keep-count': 'val',
+    'keep-days': 'val',
+}
+
 hintkeys = {}
 
 hintkeys[setup] = merge_dicts(commonkeys, versionkeys, {
@@ -76,7 +81,7 @@ hintkeys[pvr] = merge_dicts(commonkeys, {
     'build-depends': 'optval',
 })
 
-hintkeys[override] = versionkeys
+hintkeys[override] = merge_dicts(versionkeys, overridekeys)
 
 # valid categories
 categories = ['accessibility',