[setup - the official Cygwin setup program] branch master, updated. release_2.887-2-g29cca4d

jturney-9JcytcrH/[email protected]
Newsgroups gmane.os.cygwin.cvs.apps
Message-ID <[email protected]>


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

commit 29cca4de205ff68f886c95bb9e8f6f6fe9150578
Author: Jon Turney <[email protected]>
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";
           }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.