This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup 02/15] Don't bother storing prev version
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Tue, 16 May 2017 12:48:47 +0100
- Subject: [PATCH setup 02/15] Don't bother storing prev version
- Authentication-results: sourceware.org; auth=none
- References: <20170516114900.168120-1-jon.turney@dronecode.org.uk>
There's no means to select it since ec9c1d70, so don't bother remembering
which version is the prev version.
---
IniDBBuilderPackage.cc | 4 ----
package_meta.cc | 10 ++--------
package_meta.h | 6 ++----
prereq.cc | 2 +-
4 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc
index d506a9f..303ac34 100644
--- a/IniDBBuilderPackage.cc
+++ b/IniDBBuilderPackage.cc
@@ -139,7 +139,6 @@ IniDBBuilderPackage::buildPackageSource (const std::string& path,
csp->versions.clear();
csp->desired = packageversion();
csp->installed = packageversion();
- csp->prev = packageversion();
csp->curr = packageversion();
csp->exp = packageversion();
db.sourcePackages.insert (packagedb::packagecollection::value_type(csp->name,csp));
@@ -424,9 +423,6 @@ IniDBBuilderPackage::add_correct_version()
case TRUST_CURR:
v = &(cp->curr);
break;
- case TRUST_PREV:
- v = &(cp->prev);
- break;
case TRUST_TEST:
v = &(cp->exp);
break;
diff --git a/package_meta.cc b/package_meta.cc
index 24ed17e..cffb5b7 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -89,7 +89,7 @@ packagemeta::_actions::caption ()
packagemeta::packagemeta (packagemeta const &rhs) :
name (rhs.name), key (rhs.name),
categories (rhs.categories), versions (rhs.versions),
- installed (rhs.installed), prev (rhs.prev),
+ installed (rhs.installed),
curr (rhs.curr),
exp (rhs.exp),
desired (rhs.desired)
@@ -593,8 +593,6 @@ packagemeta::logAllVersions () const
std::string
packagemeta::trustLabel(packageversion const &aVersion) const
{
- if (aVersion == prev)
- return "Prev";
if (aVersion == curr)
return "Curr";
if (aVersion == exp)
@@ -606,8 +604,7 @@ void
packagemeta::logSelectionStatus() const
{
packagemeta const & pkg = *this;
- const char *trust = ((pkg.desired == pkg.prev) ? "prev"
- : (pkg.desired == pkg.curr) ? "curr"
+ const char *trust = ((pkg.desired == pkg.curr) ? "curr"
: (pkg.desired == pkg.exp) ? "test" : "unknown");
std::string action = pkg.action_caption ();
const std::string installed =
@@ -648,7 +645,6 @@ packagemeta::ScanDownloadedFiles (bool mirror_mode)
/* scan doesn't alter operator == for packageversions */
bool lazy_scan = mirror_mode
&& (*i != pkg.installed
- || pkg.installed == pkg.prev
|| pkg.installed == pkg.curr
|| pkg.installed == pkg.exp);
const_cast<packageversion &>(*i).scan (lazy_scan);
@@ -662,8 +658,6 @@ packagemeta::ScanDownloadedFiles (bool mirror_mode)
if (!i->accessible () && !pkgsrcver.accessible ()
&& *i != pkg.installed)
{
- if (pkg.prev == *i)
- pkg.prev = packageversion ();
if (pkg.curr == *i)
pkg.curr = packageversion ();
if (pkg.exp == *i)
diff --git a/package_meta.h b/package_meta.h
index 5f7842c..5c5e718 100644
--- a/package_meta.h
+++ b/package_meta.h
@@ -126,11 +126,9 @@ public:
bool user_picked;
/* which one is installed. */
packageversion installed;
- /* which one is listed as "prev" in our available packages db */
- packageversion prev;
- /* ditto for current - stable */
+ /* which one is listed as "current" (stable) in our available packages db */
packageversion curr;
- /* and finally the experimental version */
+ /* ditto for "test" (experimental) */
packageversion exp;
/* Now for the user stuff :] */
/* What version does the user want ? */
diff --git a/prereq.cc b/prereq.cc
index 4b6cd68..5a94373 100644
--- a/prereq.cc
+++ b/prereq.cc
@@ -210,7 +210,7 @@ PrereqChecker::isMet ()
Progress.SetBar1(pos, max);
// Fetch the dependencies of the package. This assumes that the
- // dependencies of the prev, curr, and exp versions are all the same.
+ // dependencies of all versions are all the same.
const vector <vector <PackageSpecification *> *> *deps = pack->curr.depends ();
// go through the package's dependencies
--
2.12.3