public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.879-15-g9b4b982
@ 2017-05-23 16:17 jturney
0 siblings, 0 replies; only message in thread
From: jturney @ 2017-05-23 16:17 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=9b4b982d5548c60547f6a2593157146e1784fa1d
commit 9b4b982d5548c60547f6a2593157146e1784fa1d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue May 23 14:40:24 2017 +0100
Restore a missing NULL-ness check
Accidentally dropped in 249e9360. This could go away if
packagesource::Canonical() was changed to return std::string and other uses
checked empty() rather than against NULL.
Diff:
---
download.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/download.cc b/download.cc
index 59af2d6..80615f3 100644
--- a/download.cc
+++ b/download.cc
@@ -78,7 +78,7 @@ check_for_cached (packagesource & pkgsource, bool mirror_mode)
/* Note that the cache dir is represented by a mirror site of file://local_dir */
std::string prefix = "file://" + local_dir + "/";
- std::string fullname = prefix + pkgsource.Canonical();
+ std::string fullname = prefix + (pkgsource.Canonical() ? pkgsource.Canonical() : "");
if (mirror_mode)
{
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-05-23 16:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-23 16:17 [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.879-15-g9b4b982 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).