From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13065 invoked by alias); 5 Jun 2017 14:32:30 -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 12002 invoked by uid 9795); 5 Jun 2017 14:32:30 -0000 Date: Mon, 05 Jun 2017 14:32:00 -0000 Message-ID: <20170605143229.10171.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-85-g77639e2 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bcf17529eb9ca8ae85f1df7d0f39ea9a277fd378 X-Git-Newrev: 77639e2f68b7857a3deaa84ce296890970fde2fc X-SW-Source: 2017-q2/txt/msg00048.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=77639e2f68b7857a3deaa84ce296890970fde2fc commit 77639e2f68b7857a3deaa84ce296890970fde2fc Author: Jon Turney Date: Thu Jun 1 18:52:14 2017 +0100 Put message: with other package section keys, not after the last package version description Diff: --- calm/package.py | 6 +++--- test/testdata/inifile/setup.ini.expected | 8 ++++---- test/testdata/process_arch/setup.ini.expected | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/calm/package.py b/calm/package.py index b0ec360..12e246a 100755 --- a/calm/package.py +++ b/calm/package.py @@ -766,6 +766,9 @@ def write_setup_ini(args, packages, arch): if requires: print("requires: %s" % ' '.join(sorted(requires)), file=f) + if 'message' in packages[p].version_hints[bv]: + print("message: %s" % packages[p].version_hints[bv]['message'], file=f) + # write tarfile lines for each stability level for level in ['curr', 'prev', 'test']: if level in packages[p].stability: @@ -791,9 +794,6 @@ def write_setup_ini(args, packages, arch): else: logging.warning("package '%s' version '%s' has no source in external-source '%s'" % (p, version, s)) - if 'message' in packages[p].version_hints[bv]: - print("message: %s" % packages[p].version_hints[bv]['message'], file=f) - # helper function to output details for a particular tar file def tar_line(category, p, t, f): diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected index 9300c70..c3957ca 100644 --- a/test/testdata/inifile/setup.ini.expected +++ b/test/testdata/inifile/setup.ini.expected @@ -170,15 +170,15 @@ 'industry standard IP protocols."\n' 'category: Net\n' 'requires: libdns_sd1\n' + 'message: mDNSResponder "The Cygwin mDNSResponder package contains only clients.\n' + "If you do not already have the 'Bonjour Service' installed (it comes with\n" + 'a number of popular Windows programs), then you can download it at\n' + 'http://support.apple.com/kb/DL999"\n' 'version: 379.32.1-1\n' 'install: x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 195 ' 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 ' 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' - 'message: mDNSResponder "The Cygwin mDNSResponder package contains only clients.\n' - "If you do not already have the 'Bonjour Service' installed (it comes with\n" - 'a number of popular Windows programs), then you can download it at\n' - 'http://support.apple.com/kb/DL999"\n' '\n' '@ openssh\n' 'sdesc: "The OpenSSH server and client programs"\n' diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected index 24bd945..652e48f 100644 --- a/test/testdata/process_arch/setup.ini.expected +++ b/test/testdata/process_arch/setup.ini.expected @@ -170,15 +170,15 @@ 'industry standard IP protocols."\n' 'category: Net\n' 'requires: libdns_sd1\n' + 'message: mDNSResponder "The Cygwin mDNSResponder package contains only clients.\n' + "If you do not already have the 'Bonjour Service' installed (it comes with\n" + 'a number of popular Windows programs), then you can download it at\n' + 'http://support.apple.com/kb/DL999"\n' 'version: 379.32.1-1\n' 'install: x86/release/mDNSResponder/mDNSResponder-379.32.1-1.tar.bz2 195 ' 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' 'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 ' 'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n' - 'message: mDNSResponder "The Cygwin mDNSResponder package contains only clients.\n' - "If you do not already have the 'Bonjour Service' installed (it comes with\n" - 'a number of popular Windows programs), then you can download it at\n' - 'http://support.apple.com/kb/DL999"\n' '\n' '@ openssh\n' 'sdesc: "The OpenSSH server and client programs"\n'