From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18649 invoked by alias); 19 Feb 2018 16:15:43 -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 18289 invoked by uid 9795); 19 Feb 2018 16:15:23 -0000 Date: Mon, 19 Feb 2018 16:15:00 -0000 Message-ID: <20180219161523.18263.qmail@sourceware.org> 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 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f82f2fb0937d764313b8fbb18e300baf7f858eae X-Git-Newrev: 29cca4de205ff68f886c95bb9e8f6f6fe9150578 X-SW-Source: 2018-q1/txt/msg00041.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=29cca4de205ff68f886c95bb9e8f6f6fe9150578 commit 29cca4de205ff68f886c95bb9e8f6f6fe9150578 Author: Jon Turney 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"; }