public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
From: jturney@sourceware.org
To: cygwin-apps-cvs@sourceware.org
Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20180130-1-ge8d59c5
Date: Tue, 30 Jan 2018 22:57:00 -0000	[thread overview]
Message-ID: <20180130225758.120653.qmail@sourceware.org> (raw)




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

commit e8d59c5257d8d1b75a9a58102759300be2455cd3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Jan 30 22:53:48 2018 +0000

    Don't suppress empty depends2: when that could cause problems
    
    Don't suppress empty depends2: if there might be a preceeding non-empty
    depends2: or requires:
    
    This is neccessary to ensure setup's parsing code doesn't re-use a previous
    non-empty value for the version under consideration.


Diff:
---
 calm/package.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index ee3a377..238e048 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -952,7 +952,7 @@ 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 packages[p].version_hints[version].get('depends', ''):
+                if packages[p].version_hints[version].get('depends', '') or requires:
                     print("depends2: %s" % packages[p].version_hints[version]['depends'], file=f)
 
                 if packages[p].version_hints[version].get('obsoletes', ''):


                 reply	other threads:[~2018-01-30 22:57 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180130225758.120653.qmail@sourceware.org \
    --to=jturney@sourceware.org \
    --cc=cygwin-apps-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).