[PATCH setup 06/10] Remove obsolete installed_from member from packagemeta
Jon Turney
jon.turney@dronecode.org.uk
Tue Aug 2 15:31:00 GMT 2016
This just stores a made-up tarfile name read from installed.db, and is never
used.
---
package_db.cc | 2 +-
package_meta.cc | 2 +-
package_meta.h | 11 ++---------
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/package_db.cc b/package_db.cc
index 73dfbf6..87da922 100644
--- a/package_db.cc
+++ b/package_db.cc
@@ -96,7 +96,7 @@ packagedb::packagedb ()
packagemeta *pkg = findBinary (PackageSpecification(pkgname));
if (!pkg)
{
- pkg = new packagemeta (pkgname, inst);
+ pkg = new packagemeta (pkgname);
packages.insert (packagedb::packagecollection::value_type(pkgname, pkg));
/* we should install a new handler then not check this...
*/
diff --git a/package_meta.cc b/package_meta.cc
index 34ff78c..21b21ef 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -91,7 +91,7 @@ packagemeta::_actions::caption ()
}
packagemeta::packagemeta (packagemeta const &rhs) :
- name (rhs.name), key (rhs.name), installed_from (),
+ name (rhs.name), key (rhs.name),
categories (rhs.categories), versions (rhs.versions),
installed (rhs.installed), prev (rhs.prev),
curr (rhs.curr),
diff --git a/package_meta.h b/package_meta.h
index b24d4fc..3d6ccd2 100644
--- a/package_meta.h
+++ b/package_meta.h
@@ -35,17 +35,11 @@ public:
static void ScanDownloadedFiles (bool);
packagemeta (packagemeta const &);
packagemeta (const std::string& pkgname)
- : name (pkgname), key(pkgname), installed_from (), user_picked (false),
+ : name (pkgname), key(pkgname), user_picked (false),
architecture (), priority(), visited_(false)
{
}
- packagemeta (const std::string& pkgname, const std::string& installedfrom)
- : name (pkgname), key(pkgname), installed_from (installedfrom),
- user_picked (false), architecture (), priority(), visited_(false)
- {
- }
-
~packagemeta ();
void add_version (packageversion &);
@@ -118,8 +112,7 @@ public:
std::string name; /* package name, like "cygwin" */
std::string key;
- /* legacy variable used to output data for installed.db versions <= 2 */
- std::string installed_from;
+
/* true if package was selected on command-line. */
bool isManuallyWanted() const;
/* true if package was deleted on command-line. */
--
2.8.3
More information about the Cygwin-apps
mailing list