From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 122790 invoked by alias); 2 Aug 2016 15:31:35 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 122727 invoked by uid 89); 2 Aug 2016 15:31:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=categories, Hx-spam-relays-external:CriticalPath, H*RU:CriticalPath X-HELO: rgout0204.bt.lon5.cpcloud.co.uk Received: from rgout0204.bt.lon5.cpcloud.co.uk (HELO rgout0204.bt.lon5.cpcloud.co.uk) (65.20.0.203) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 02 Aug 2016 15:31:24 +0000 X-OWM-Source-IP: 31.51.206.218 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=7/50,refid=2.7.2:2016.8.1.131817:17:7.944,ip=31.51.206.218,rules=__HAS_FROM, __TO_MALFORMED_2, __TO_NO_NAME, __HAS_CC_HDR, __CC_NAME, __CC_NAME_DIFF_FROM_ACC, __HAS_MSGID, __SANE_MSGID, __HAS_X_MAILER, __IN_REP_TO, __REFERENCES, __FROM_DOMAIN_IN_ANY_CC1, BODYTEXTP_SIZE_3000_LESS, BODY_SIZE_2000_2999, __MIME_TEXT_ONLY, RDNS_GENERIC_POOLED, HTML_00_01, HTML_00_10, BODY_SIZE_5000_LESS, RDNS_SUSP_GENERIC, NO_URI_FOUND, NO_CTA_URI_FOUND, __FROM_DOMAIN_IN_RCPT, RDNS_SUSP, IN_REP_TO, REFERENCES, BODY_SIZE_7000_LESS, NO_URI_HTTPS, MSG_THREAD, __CC_REAL_NAMES, MULTIPLE_REAL_RCPTS, LEGITIMATE_SIGNS, LEGITIMATE_NEGATE Received: from localhost.localdomain (31.51.206.218) by rgout02.bt.lon5.cpcloud.co.uk (8.6.122.06) (authenticated as jonturney@btinternet.com) id 57A0AF7B0001D917; Tue, 2 Aug 2016 16:31:24 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 06/10] Remove obsolete installed_from member from packagemeta Date: Tue, 02 Aug 2016 15:31:00 -0000 Message-Id: <20160802153037.125216-7-jon.turney@dronecode.org.uk> In-Reply-To: <20160802153037.125216-1-jon.turney@dronecode.org.uk> References: <20160802153037.125216-1-jon.turney@dronecode.org.uk> X-SW-Source: 2016-08/txt/msg00013.txt.bz2 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