From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-apps@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH setup 07/11] Don't handle missing 'version:'
Date: Fri, 28 Apr 2017 12:13:00 -0000 [thread overview]
Message-ID: <20170428121205.12240-8-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20170428121205.12240-1-jon.turney@dronecode.org.uk>
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 <string.h>
@@ -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
next prev parent reply other threads:[~2017-04-28 12:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-28 12:12 [PATCH setup 00/11] Various setup patches Jon Turney
2017-04-28 12:12 ` [PATCH setup 02/11] Remove unused package_status_t stored in packageversion class Jon Turney
2017-04-28 12:12 ` [PATCH setup 01/11] Remove pointless abstract base class IniDBBuilder Jon Turney
2017-04-28 12:13 ` [PATCH setup 05/11] Use const version of packageversion::depends() in PrereqChecker Jon Turney
2017-04-28 12:13 ` [PATCH setup 10/11] Don't show source-only packages in package list Jon Turney
2017-05-01 14:45 ` Yaakov Selkowitz
2017-05-01 19:35 ` Jon Turney
2017-04-28 12:13 ` [PATCH setup 06/11] packageversion::sourcePackageSpecification() is const Jon Turney
2017-04-28 12:13 ` [PATCH setup 11/11] Use wininet for fetching URLs in direct (non-proxy) case (DO NOT APPLY) Jon Turney
2017-04-28 15:33 ` Åke Rehnman
2017-04-29 10:53 ` Jon Turney
2017-05-01 12:58 ` Jon Turney
2017-05-01 15:31 ` Åke Rehnman
2017-05-01 20:45 ` Jon Turney
2017-05-02 7:28 ` Åke Rehnman
2017-05-02 11:05 ` Jon Turney
2017-05-02 19:29 ` Åke Rehnman
2017-05-03 16:37 ` Jon Turney
[not found] ` <60ed2d4e-7c89-a9b8-e3ab-e3d0819b7e56@gmail.com>
2017-05-04 10:11 ` Jon Turney
2017-05-16 14:00 ` Jon Turney
[not found] ` <e402101c-8e7d-98ed-b39a-c82100d6d59f@gmail.com>
2017-05-17 10:55 ` Jon Turney
2017-05-03 7:22 ` Brian Inglis
2017-05-03 16:37 ` Jon Turney
2017-04-28 12:13 ` [PATCH setup 09/11] Make building with DEBUG less useless Jon Turney
2017-04-28 12:13 ` [PATCH setup 08/11] Don't do unneeded work when changing stability level Jon Turney
2017-04-28 12:13 ` [PATCH setup 04/11] Make packageversion::source(|s) const Jon Turney
2017-04-28 12:13 ` Jon Turney [this message]
2017-04-28 12:13 ` [PATCH setup 03/11] Remove cygpackage::destroy() because it does nothing Jon Turney
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=20170428121205.12240-8-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).