* choose.cc (scan2): Fix incorrect setting of TRUST_CURR rather than TRUST_PREV

which produced "0" versions.

diff --git a/ChangeLog b/ChangeLog
index a709c68e5fde7756e7e6fae3b0eb4426fea06c40..8aec063f701a8c46f5ef43f309e8e163f9134e2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  8 23:33:38 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * choose.cc (scan2): Fix incorrect setting of TRUST_CURR rather than
+       TRUST_PREV which produced "0" versions.
+
 2001-05-07  Brian Keener <bkeener@thesoftwaresource.com>
 
        * resource.h: Add new field IDC_CHOOSE_INST_TEXT.  Modify

diff --git a/choose.cc b/choose.cc
index a128eb5423154cece03869d90b58b2e749986ee6..e5dc7117d6dcc6fddd1acc3f7e87c10408b3750e 100644 (file)
--- a/choose.cc
+++ b/choose.cc
@@ -858,9 +858,9 @@ scan2 (char *path, unsigned int size)
                      break;
                    }
                }
-      break;
+             break;
            }
-    }
+       }
       if (strcmp (pkginfo, mainpkg) == 0)
        {
          for (t = 0; t < NTRUST; t++)
@@ -904,7 +904,7 @@ scan2 (char *path, unsigned int size)
                }
              else if (!package[i].info[TRUST_PREV].install)
                {
-                 package[i].info[TRUST_CURR].version = 0;
+                 package[i].info[TRUST_PREV].version = 0;
                  int tarsrcext = tarext - 4;
                  if (tarsrcext > 0 && strncmp (path + tarsrcext , "-src", 4) == 0)
                    {