Wed Sep 26 21:39:00 Robert Collins rbtcollins@hotmail.com

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

diff --git a/ChangeLog b/ChangeLog
index d4e4095c538116ee857fbbaba49c1773c570ca57..d415ff797e7d6edcdcb228eae7a1f2ad5b1cd700 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 26 21:39:00  Robert Collins rbtcollins@hotmail.com
+
+       * choose.cc (_view::insert_pkg): Correctly exit loop.
+       * iniparse.y (register_category): Always insert new categories.
+
 Fri Sep 21 13:56:32 2001  Christopher Faylor <cgf@cygnus.com>
 
        * inilex.l (yylex): For comments, eat all characters up to, but not

diff --git a/choose.cc b/choose.cc
index e10ec14123ded21524b363a4e35354d5b5e080b6..fa2da1d8de4ba2ea2bce55548593e552ce17b5cd 100644 (file)
--- a/choose.cc
+++ b/choose.cc
@@ -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)

diff --git a/iniparse.y b/iniparse.y
index 0e742e441475150bf57b2f0e98053cf45017b84b..991407907eae7d0b9c547eb66e618316ec95868c 100644 (file)
--- a/iniparse.y
+++ b/iniparse.y
@@ -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)
            {