From 7d66d192d5493e9c7aa1d46edb59ce8904866c46 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 30 Nov 2001 11:37:01 +0000 Subject: [PATCH] 2001-11-30 Robert Collins * package_db.cc (packagedb::flush): Write a canonical version for all packages irrespective of the media they were installed from. --- ChangeLog | 5 +++++ package_db.cc | 22 ++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 069eb70e..844b872e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-11-30 Robert Collins + + * 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 * Makefile.in (OBJS): Add package_source and rfc1738. diff --git a/package_db.cc b/package_db.cc index 333af4a0..0c609234 100644 --- 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 (); -- 2.43.5