This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup 07/11] Don't handle missing 'version:'
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Fri, 28 Apr 2017 13:12:01 +0100
- Subject: [PATCH setup 07/11] Don't handle missing 'version:'
- Authentication-results: sourceware.org; auth=none
- References: <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