From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 06/10] Remove obsolete installed_from member from packagemeta
Date: Tue, 02 Aug 2016 15:31:00 -0000 [thread overview]
Message-ID: <20160802153037.125216-7-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20160802153037.125216-1-jon.turney@dronecode.org.uk>
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
next prev parent reply other threads:[~2016-08-02 15:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 15:31 [PATCH setup 00/10] Various setup patches Jon Turney
2016-08-02 15:31 ` [PATCH setup 04/10] Downgrade "Running preremove script" logging to debug Jon Turney
2016-08-02 15:31 ` Jon Turney [this message]
2016-08-02 15:31 ` [PATCH setup 02/10] Prevent libtool warning that a getopt++ shared library cannot be built Jon Turney
2016-08-02 15:31 ` [PATCH setup 10/10] Reserve paths starting "." for package metadata Jon Turney
2016-08-02 15:31 ` [PATCH setup 05/10] Properly report progress in PrereqChecker::isMet Jon Turney
2016-08-02 15:31 ` [PATCH setup 01/10] Remove stray execute permissions Jon Turney
2016-08-02 15:31 ` [PATCH setup 09/10] Add an additional filter view, showing packages which were user picked Jon Turney
2016-08-02 15:31 ` [PATCH setup 07/10] Remove unused fn member from cygpackage Jon Turney
2016-08-02 15:31 ` [PATCH setup 08/10] Track if a package was installed by user, or as a dependency Jon Turney
2016-08-03 10:49 ` Jon Turney
2016-08-02 15:31 ` [PATCH setup 03/10] Add lex and yacc generated files to .gitignore Jon Turney
2016-08-03 7:10 ` [PATCH setup 00/10] Various setup patches Achim Gratz
2016-08-03 8:35 ` Corinna Vinschen
2016-08-03 9:52 ` Achim Gratz
2016-08-03 17:40 ` Corinna Vinschen
2016-08-03 18:28 ` Achim Gratz
2016-08-03 18:43 ` Corinna Vinschen
2016-08-03 19:52 ` Achim Gratz
2016-08-04 11:40 ` Corinna Vinschen
2016-08-04 17:57 ` Achim Gratz
2016-08-04 18:00 ` Corinna Vinschen
2016-08-04 19:26 ` Achim Gratz
2016-08-03 17:30 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160802153037.125216-7-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).