public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
From: jturney@sourceware.org
To: cygwin-apps-cvs@sourceware.org
Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.887-2-g29cca4d
Date: Mon, 19 Feb 2018 16:15:00 -0000	[thread overview]
Message-ID: <20180219161523.18263.qmail@sourceware.org> (raw)




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=29cca4de205ff68f886c95bb9e8f6f6fe9150578

commit 29cca4de205ff68f886c95bb9e8f6f6fe9150578
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Tue Feb 13 22:32:06 2018 +0000

    Don't crash in confirm page when installing source packages


Diff:
---
 confirm.cc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/confirm.cc b/confirm.cc
index 7e949d8..eb6bd99 100644
--- a/confirm.cc
+++ b/confirm.cc
@@ -73,7 +73,7 @@ ConfirmPage::OnActivate()
               s += i->version.Name();
               s += " ";
               s += i->version.Canonical_version();
-              if (pkg->desired)
+              if (pkg && pkg->desired)
                 s += " (automatically added)";
               s += "\r\n";
             }
@@ -96,7 +96,9 @@ ConfirmPage::OnActivate()
             s += i->version.Name();
             s += " ";
             s += i->version.Canonical_version();
-            if (!pkg->desired)
+            if (i->version.Type() == package_source)
+              s += " (source)";
+            else if (pkg && !pkg->desired)
               s += " (automatically added)";
             s += "\r\n";
           }


                 reply	other threads:[~2018-02-19 16:15 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=20180219161523.18263.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).