public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [setup - the official Cygwin setup program] branch master, updated. release_2.887-2-g29cca4d
@ 2018-02-19 16:15 jturney
0 siblings, 0 replies; only message in thread
From: jturney @ 2018-02-19 16:15 UTC (permalink / raw)
To: cygwin-apps-cvs
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";
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-02-19 16:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-19 16:15 [setup - the official Cygwin setup program] branch master, updated. release_2.887-2-g29cca4d jturney
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).