diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2018-07-17 21:35:56 +0200 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2018-07-17 21:35:56 +0200 |
| commit | 0974ac5b5fbbb64dad2304918a6bb95e4e6e6db1 (patch) | |
| tree | 4829bc17315efcc855697a09490177ad80ce575e | |
| parent | d06284530b9b6eeec0cab7d7ea3cd23cfbca0190 (diff) | |
| download | python-lxml-0974ac5b5fbbb64dad2304918a6bb95e4e6e6db1.tar.gz | |
Include "*-rc" versions of libxml2/libxslt in parsed version when downloading the "latest" libraries.
| -rw-r--r-- | buildlibxml.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/buildlibxml.py b/buildlibxml.py index 6c9b33ae..e114eee7 100644 --- a/buildlibxml.py +++ b/buildlibxml.py @@ -204,7 +204,7 @@ def tryint(s): def download_libxml2(dest_dir, version=None): """Downloads libxml2, returning the filename where the library was downloaded""" - version_re = re.compile(r'LATEST_LIBXML2_IS_([0-9.]+[0-9])') + version_re = re.compile(r'LATEST_LIBXML2_IS_([0-9.]+[0-9](?:-[abrc0-9]+)?)') filename = 'libxml2-%s.tar.gz' return download_library(dest_dir, LIBXML2_LOCATION, 'libxml2', version_re, filename, version=version) @@ -212,7 +212,7 @@ def download_libxml2(dest_dir, version=None): def download_libxslt(dest_dir, version=None): """Downloads libxslt, returning the filename where the library was downloaded""" - version_re = re.compile(r'LATEST_LIBXSLT_IS_([0-9.]+[0-9])') + version_re = re.compile(r'LATEST_LIBXSLT_IS_([0-9.]+[0-9](?:-[abrc0-9]+)?)') filename = 'libxslt-%s.tar.gz' return download_library(dest_dir, LIBXML2_LOCATION, 'libxslt', version_re, filename, version=version) @@ -236,7 +236,7 @@ def download_zlib(dest_dir, version): def find_max_version(libname, filenames, version_re=None): if version_re is None: - version_re = re.compile(r'%s-([0-9.]+[0-9])' % libname) + version_re = re.compile(r'%s-([0-9.]+[0-9](?:-[abrc0-9]+)?)' % libname) versions = [] for fn in filenames: match = version_re.search(fn) |