2002-07-02 Robert Collins <rbtcollins@hotmail.com>

        * Makefile.am (inilint_SOURCES): Add PackageSpecification sources.
        nb: inilint is still incomplete, as the packageversion code is not
        ready for database-less linking.
        * site.cc (get_site_list): When the same site is reentered by the user
        replace the old one. (Suggested by John Marshall).

diff --git a/ChangeLog b/ChangeLog
index 4dfb474f2b1144acedc1de667c5f57b40d07c61b..a04e35373941087b67277441ecefdc580d6b0c27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-02  Robert Collins  <rbtcollins@hotmail.com>
+
+       * Makefile.am (inilint_SOURCES): Add PackageSpecification sources.
+       nb: inilint is still incomplete, as the packageversion code is not
+       ready for database-less linking.
+       * site.cc (get_site_list): When the same site is reentered by the user
+       replace the old one. (Suggested by John Marshall).
+
 2002-07-02  Robert Collins  <rbtcollins@hotmail.com>
 
        * IniDBBuilderPackage.cc (IniDBBuilderPackage::buildPackageSource):

diff --git a/Makefile.am b/Makefile.am
index 6e374fbe1c91f7603ec8674567564df04f36199d..ba7afb5505c5ca7dce4d0e1c5332f1754d593635 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,6 @@ BUILT_SOURCES = setup_version.c \
 if MINGWTARGET
   inilint_extras = \
        autoload.c \
-       mklink2.cc\
        mklink2.cc
 else
   inilint_extras =
@@ -102,6 +101,8 @@ inilint_SOURCES = \
   IOStreamProvider.h \
   mkdir.cc \
   mkdir.h \
+  PackageSpecification.cc \
+  PackageSpecification.h \
   PackageTrust.h \
   rfc1738.cc \
   rfc1738.h \

diff --git a/Makefile.in b/Makefile.in
index c95fc260cf656411b7e93be7194ef15ab71c2c8b..e90d6c469677c6d52472c56f552d4814006c27fa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -160,7 +160,6 @@ BUILT_SOURCES = setup_version.c \
 
 @MINGWTARGET_TRUE@inilint_extras = \
 @MINGWTARGET_TRUE@     autoload.c \
-@MINGWTARGET_TRUE@     mklink2.cc\
 @MINGWTARGET_TRUE@     mklink2.cc
 
 @MINGWTARGET_FALSE@inilint_extras = 
@@ -196,6 +195,8 @@ inilint_SOURCES = \
   IOStreamProvider.h \
   mkdir.cc \
   mkdir.h \
+  PackageSpecification.cc \
+  PackageSpecification.h \
   PackageTrust.h \
   rfc1738.cc \
   rfc1738.h \
@@ -378,15 +379,15 @@ EXTRA_PROGRAMS = inilint$(EXEEXT)
 noinst_PROGRAMS = setup$(EXEEXT) @INILINT@
 PROGRAMS = $(noinst_PROGRAMS)
 
-@MINGWTARGET_TRUE@am__objects_1 = autoload.$(OBJEXT) mklink2.$(OBJEXT) \
-@MINGWTARGET_TRUE@     mklink2.$(OBJEXT)
+@MINGWTARGET_TRUE@am__objects_1 = autoload.$(OBJEXT) mklink2.$(OBJEXT)
 @MINGWTARGET_FALSE@am__objects_1 =
 am_inilint_OBJECTS = filemanip.$(OBJEXT) find.$(OBJEXT) \
        FindVisitor.$(OBJEXT) LogSingleton.$(OBJEXT) \
        IniDBBuilder.$(OBJEXT) inilex.$(OBJEXT) inilintmain.$(OBJEXT) \
        iniparse.$(OBJEXT) IniParseFeedback.$(OBJEXT) \
        io_stream.$(OBJEXT) io_stream_file.$(OBJEXT) mkdir.$(OBJEXT) \
-       rfc1738.$(OBJEXT) String++.$(OBJEXT) $(am__objects_1)
+       PackageSpecification.$(OBJEXT) rfc1738.$(OBJEXT) \
+       String++.$(OBJEXT) $(am__objects_1)
 inilint_OBJECTS = $(am_inilint_OBJECTS)
 inilint_DEPENDENCIES = libgetopt++/libgetopt++.la
 inilint_LDFLAGS =

diff --git a/site.cc b/site.cc
index a3dd8c55d685edf09a1980436a1286e505a489f3..46da41cd367be69d6103dcbc71af25edd393d3ac 100644 (file)
--- a/site.cc
+++ b/site.cc
@@ -168,8 +168,11 @@ get_site_list (HINSTANCE h, HWND owner)
          site_list_type & listobj =
            all_site_list.registerbyobject (*newsite);
          if (&listobj != newsite)
-           /* That site was already registered */
-           delete newsite;
+           {
+             /* That site was already registered */
+             listobj = *newsite;
+             delete newsite;
+           }
        }
     }
   delete[] theString;