2001-11-30 Robert Collins <rbtcollins@hotmail.com>

        * package_db.cc (packagedb::flush): Write a canonical version for all packages
        irrespective of the media they were installed from.

diff --git a/ChangeLog b/ChangeLog
index 069eb70ec9d6228eedea21ebcb0db64801e7af04..844b872e48b9870294e021357248772b82999aee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-30  Robert Collins  <rbtcollins@hotmail.com>
+
+       * package_db.cc (packagedb::flush): Write a canonical version for all packages
+       irrespective of the media they were installed from.
+
 2001-11-29  Robert Collins  <rbtcollins@hotmail.com>
 
        * Makefile.in (OBJS): Add package_source and rfc1738.

diff --git a/package_db.cc b/package_db.cc
index 333af4a068d99108a7092687eda54eec25929025..0c609234ebed4a01fe9856bece778182fe0b564d 100644 (file)
--- a/package_db.cc
+++ b/package_db.cc
@@ -206,10 +206,14 @@ packagedb::flush ()
              char line[2048];
 
              /* size here is irrelevant - as we can assume that this install source
-                * no longer exists, and it does not correlate to used disk space
+              * no longer exists, and it does not correlate to used disk space
+              * also note that we are writing a fictional install source 
+              * to keep cygcheck happy.               
               */
-             sprintf (line, "%s %s %d\n", pkgm->name, pkgm->installed_from,
-                      0);
+             sprintf (line, "%s %s %d\n", pkgm->name,
+                      concat (pkgm->name, "-",
+                              pkgm->installed->Canonical_version (),
+                              ".tar.bz2", 0), 0);
              ndb->write (line, strlen (line));
            }
          pkgm = getnextpackage ();
@@ -241,9 +245,15 @@ packagemeta & packagedb::registerpackage (char const *pkgname)
 packagemeta **
   packagedb::packages =
   0;
-size_t packagedb::packagecount = 0;
-size_t packagedb::packagespace = 0;
+size_t
+  packagedb::packagecount =
+  0;
+size_t
+  packagedb::packagespace =
+  0;
 int
   packagedb::installeddbread =
   0;
-CategoryList packagedb::categories = CategoryList ();
+CategoryList
+  packagedb::categories =
+  CategoryList ();