This is the mail archive of the
cygwin-patches@cygwin.com
mailing list for the Cygwin project.
Re: [patch] change to choose.cc in setup.exe for Redownload/Sources crashes
- To: cygwin-patches <cygwin-patches at cygwin dot com>
- Subject: Re: [patch] change to choose.cc in setup.exe for Redownload/Sources crashes
- From: Christopher Faylor <cgf at redhat dot com>
- Date: Thu, 17 May 2001 23:37:30 -0400
- References: <VA.0000078b.0055922a@thesoftwaresource.com>
- Reply-To: cygwin-patches at cygwin dot com
I hate to say this, but after all of the discussion about indenting,
the indentation below is obviously wrong.
Also, this line is less than clear:
if (0 <= extra[i].which_is_installed <= TRUST_TEST)
Could you fix these two things, Brian.
I appreciate your tracking this down very much. Especially since I
think its code that I broke.
cgf
On Thu, May 17, 2001 at 10:10:06PM -0400, Brian Keener wrote:
>
>2001-05-07 Brian Keener <bkeener@thesoftwaresource.com>
>
> * choose.cc (do_choose): Fix incorrect assignment of trust setting
> to use when Redownload or Sources Only selected.
>
>
>Index: choose.cc
>===================================================================
>RCS file: /cvs/src/src/winsup/cinstall/choose.cc,v
>retrieving revision 2.19
>diff -u -p -w -r2.19 choose.cc
>--- choose.cc 2001/05/11 02:39:27 2.19
>+++ choose.cc 2001/05/18 01:39:07
>@@ -1059,7 +1059,10 @@ do_choose (HINSTANCE h)
>
> case TRUST_REDO:
> package[i].action = ACTION_REDO;
>- package[i].trust = extra[i].chooser[extra[i].pick].trust;
>+ if (0 <= extra[i].which_is_installed <= TRUST_TEST)
>+ package[i].trust = extra[i].which_is_installed;
>+ else
>+ package[i].trust = TRUST_CURR;
> break;
>
> case TRUST_UNINSTALL:
>@@ -1070,7 +1073,10 @@ do_choose (HINSTANCE h)
>
> case TRUST_SRC_ONLY:
> package[i].action = ACTION_SRC_ONLY;
>- package[i].trust = extra[i].chooser[extra[i].pick].trust;
>+ if (0 <= extra[i].which_is_installed <= TRUST_TEST)
>+ package[i].trust = extra[i].which_is_installed;
>+ else
>+ package[i].trust = TRUST_CURR;
> package[i].srcaction = SRCACTION_YES;
> break;
>
>
>
--
cgf@cygnus.com Red Hat, Inc.
http://sources.redhat.com/ http://www.redhat.com/