Mailing-List:	contact cygwin-apps-help AT sourceware DOT cygnus DOT com; run by ezmlm
Sender:	cygwin-apps-owner AT sourceware DOT cygnus DOT com
List-Subscribe:	<mailto:cygwin-apps-subscribe AT sources DOT redhat DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin-apps/>
List-Post:	<mailto:cygwin-apps AT sources DOT redhat DOT com>
List-Help:	<mailto:cygwin-apps-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/lists.html#faqs>
Delivered-To:	mailing list cygwin-apps AT sources DOT redhat DOT com
Message-ID:	<004801c14680$2877c2a0$0200a8c0@lifelesswks>
From:	"Robert Collins" <robert DOT collins AT itdomain DOT com DOT au>
To:	<gp AT familiehaase DOT de>, <cygwin-apps AT cygwin DOT com>
Cc:	<cygwin-patches AT cygwin DOT com>
References:	<3BB1A27D DOT 4773 DOT 50774CA1 AT localhost> <002e01c1467b$ba63f800$0200a8c0 AT lifelesswks>
Subject:	Re: setup.exe crashs / setup.ini patch for perl
Date:	Wed, 26 Sep 2001 21:41:18 +1000
MIME-Version:	1.0
X-Priority:	3
X-MSMail-Priority:	Normal
X-Mailer:	Microsoft Outlook Express 5.50.4133.2400
X-MIMEOLE:	Produced By Microsoft MimeOLE V5.50.4133.2400
X-OriginalArrivalTime:	26 Sep 2001 11:48:54.0528 (UTC) FILETIME=[37E0A800:01C14681]

This patch (against cvs) should fix it all.

Index: choose.cc
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/choose.cc,v
retrieving revision 2.47
diff -u -p -r2.47 choose.cc
--- choose.cc 2001/08/05 01:38:46 2.47
+++ choose.cc 2001/09/26 11:38:14
@@ -803,7 +803,10 @@ _view::insert_pkg (Package *pkg)
        /* this should be a generic call to list_sort_cmp */
        if (lines[n].get_category ()
     && cat->name == lines[n].get_category ()->name)
+  {
     insert_under (n, line);
+    n = nlines;
+  }
        n++;
      }
    if (n == nlines)
Index: iniparse.y
===================================================================
RCS file: /cvs/src/src/winsup/cinstall/iniparse.y,v
retrieving revision 2.11
diff -u -p -r2.11 iniparse.y
--- iniparse.y 2001/08/05 01:38:46 2.11
+++ iniparse.y 2001/09/26 11:38:14
@@ -188,6 +188,8 @@ register_category (char *name)
  }
       else
  {
+   tempcat->next = sortcat->next;
+   sortcat->next = tempcat;
    while (sortcat->next &&
    strcasecmp(sortcat->next->name, tempcat->name) < 0)
      {



ChangeLog
Web Sep 26 21:39:00  Robert Collins rbtcollins AT hotmail DOT com

    * choose.cc (_view::insert_pkg): Correctly exit loop.
    * iniparse.y (register_category): Always insert new categories.

Rob
----- Original Message -----
From: "Robert Collins" <robert DOT collins AT itdomain DOT com DOT au>
To: <gp AT familiehaase DOT de>; <cygwin-apps AT cygwin DOT com>
Cc: <cygwin-patches AT cygwin DOT com>
Sent: Wednesday, September 26, 2001 9:09 PM
Subject: Re: setup.exe crashs / setup.ini patch for perl


> ----- Original Message -----
> From: "Gerrit P. Haase" <gp AT familiehaase DOT de>
> To: <cygwin-apps AT cygwin DOT com>
> Cc: <cygwin-patches AT cygwin DOT com>
> Sent: Wednesday, September 26, 2001 5:40 PM
> Subject: setup.exe crashs / setup.ini patch for perl
>
>
> > Hi,
> >
> > I will be OOO (out of office:) the next week, unfortunately I will
not
> > be able to do more debugging on setup.exe <-> choose.cc, it just
> starts
> > making fun:)
> >
> > But some hints:
> > ===============
> > The original (CVS) setup.exe crashes only if you have some packages
> with
> > dependencies NOT installed.
>
> Thank you thank you thank you. I can reproduce the fault now.
>
> Rob
>
>

- Raw text -