From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 125179 invoked by alias); 11 Apr 2017 15:02:15 -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 124792 invoked by uid 9795); 11 Apr 2017 15:02:14 -0000 Date: Tue, 11 Apr 2017 15:02:00 -0000 Message-ID: <20170411150214.124733.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-63-g83faeef X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ad55c8b8597def4ee7f88ea902afce7276547c2b X-Git-Newrev: 83faeef19bb1c5a8fd2a9283cb7752bfe41aed52 X-SW-Source: 2017-q2/txt/msg00007.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=83faeef19bb1c5a8fd2a9283cb7752bfe41aed52 commit 83faeef19bb1c5a8fd2a9283cb7752bfe41aed52 Author: Jon Turney Date: Thu May 12 16:45:33 2016 +0000 Tweak email recipents Add stromeko to errors list Add jturney and yselkowitz to Bcc list https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=e3f4bcfc8699211e24a58063f6094287d7f09d78 commit e3f4bcfc8699211e24a58063f6094287d7f09d78 Author: Jon Turney Date: Fri Jun 24 14:23:51 2016 +0100 Also check for skip: but install files Check the condition both ways, so the presence/absence of skip: matches absence/presence of an install tarfile Diff: --- calm/package.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/calm/package.py b/calm/package.py index 7d5a5d5..0513084 100755 --- a/calm/package.py +++ b/calm/package.py @@ -468,7 +468,7 @@ def validate_packages(args, packages): packages[p].skip = True logging.info("package '%s' appears to be source-only as it has no non-empty install tarfiles and no dependencies, marking as 'skip'" % (p)) - elif has_install: + elif has_install and any(['skip' in version_hints[vr] for vr in vr_list]): logging.error("package '%s' has 'skip:' hint but also has install tarfiles" % (p)) error = True