From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46703 invoked by alias); 30 Aug 2018 11:28:51 -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 46679 invoked by uid 9795); 30 Aug 2018 11:28:50 -0000 Date: Thu, 30 Aug 2018 11:28:00 -0000 Message-ID: <20180830112850.46652.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20180605-4-gd21631e X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 373f110e82b764fdd2deea36edab05deccca267a X-Git-Newrev: d21631e6a3b2f1f96754735c436fc53ba94b5dcd X-SW-Source: 2018-q3/txt/msg00009.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d21631e6a3b2f1f96754735c436fc53ba94b5dcd commit d21631e6a3b2f1f96754735c436fc53ba94b5dcd Author: Jon Turney Date: Thu Aug 30 12:12:51 2018 +0100 Fix some silent errors when parsing hints fails Diff: --- calm/package.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/calm/package.py b/calm/package.py index 5768224..e9bbe70 100755 --- a/calm/package.py +++ b/calm/package.py @@ -185,6 +185,7 @@ def read_package(packages, basedir, dirpath, files, remove=[], upload=False): if legacy: hints = read_hints(p, os.path.join(dirpath, 'setup.hint'), hint.setup) if not hints: + logging.error("error parsing %s" % (os.path.join(dirpath, 'setup.hint'))) return True warnings = clean_hints(p, hints, warnings) files.remove('setup.hint') @@ -198,6 +199,7 @@ def read_package(packages, basedir, dirpath, files, remove=[], upload=False): # read override.hint override_hints = read_hints(p, os.path.join(dirpath, 'override.hint'), hint.override) if not override_hints: + logging.error("error parsing %s" % (os.path.join(dirpath, 'override.hint'))) return True files.remove('override.hint') else: @@ -311,6 +313,7 @@ def read_package(packages, basedir, dirpath, files, remove=[], upload=False): # is there a PVR.hint file? pvr_hint = read_hints(p, os.path.join(dirpath, hint_fn), hint.pvr) if not pvr_hint: + logging.error("error parsing %s" % (os.path.join(dirpath, hint_fn))) return True warnings = clean_hints(p, pvr_hint, warnings) files.remove(hint_fn)