From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15021 invoked by alias); 28 Apr 2017 12:13:16 -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 14870 invoked by uid 89); 28 Apr 2017 12:13:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=site X-HELO: rgout01.bt.lon5.cpcloud.co.uk Received: from rgout0104.bt.lon5.cpcloud.co.uk (HELO rgout01.bt.lon5.cpcloud.co.uk) (65.20.0.124) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Apr 2017 12:13:14 +0000 X-OWM-Source-IP: 31.51.207.210 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-Junkmail-Premium-Raw: score=8/50,refid=2.7.2:2017.4.26.2416:17:8.707,ip=,rules=NO_URI_FOUND, NO_CTA_URI_FOUND, NO_MESSAGE_ID, NO_URI_HTTPS, TO_MALFORMED Received: from localhost.localdomain (31.51.207.210) by rgout01.bt.lon5.cpcloud.co.uk (9.0.019.13-1) (authenticated as jonturney@btinternet.com) id 58F62BE3012F5655; Fri, 28 Apr 2017 13:13:15 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH setup 07/11] Don't handle missing 'version:' Date: Fri, 28 Apr 2017 12:13:00 -0000 Message-Id: <20170428121205.12240-8-jon.turney@dronecode.org.uk> In-Reply-To: <20170428121205.12240-1-jon.turney@dronecode.org.uk> References: <20170428121205.12240-1-jon.turney@dronecode.org.uk> X-SW-Source: 2017-04/txt/msg00098.txt.bz2 If the setup.ini is missing a 'version:' line, parse the version number out of the 'install:' filename. Let's not do that anymore... --- IniDBBuilderPackage.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc index 582d249..a453a7d 100644 --- a/IniDBBuilderPackage.cc +++ b/IniDBBuilderPackage.cc @@ -24,7 +24,6 @@ #include "package_meta.h" #include "package_version.h" #include "cygpackage.h" -#include "filemanip.h" #include "ini.h" // for strtoul #include @@ -170,7 +169,6 @@ IniDBBuilderPackage::buildPackageSource (const std::string& path, spec.setOperator (PackageSpecification::Equals); spec.setVersion (cbpv.Canonical_version()); - // process_src (*cspv.source(), path); setSourceSize (*cspv.source(), size); } @@ -457,16 +455,6 @@ IniDBBuilderPackage::process_src (packagesource &src, const std::string& path) if (!src.Canonical()) src.set_canonical (path.c_str()); src.sites.push_back(site(parse_mirror)); - - if (!cbpv.Canonical_version ().size()) - { - fileparse f; - if (parse_filename (path, f)) - { - cbpv.setCanonicalVersion (f.ver); - add_correct_version (); - } - } } void -- 2.12.2