From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13155 invoked by alias); 27 Sep 2016 12:54:25 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 13130 invoked by uid 9795); 27 Sep 2016 12:54:24 -0000 Date: Tue, 27 Sep 2016 12:54:00 -0000 Message-ID: <20160927125424.13104.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-25-g9bdd081 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 432c17a62e7a5f7e89e64b8149524f9f5237ea5e X-Git-Newrev: 9bdd081e6dbedbb8e9f4772091ea1d36a58cc421 X-SW-Source: 2016-q3/txt/msg00039.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=9bdd081e6dbedbb8e9f4772091ea1d36a58cc421 commit 9bdd081e6dbedbb8e9f4772091ea1d36a58cc421 Author: Jon Turney 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',