[releng] Revert "convert-to-tarballs: Include prerelease identifiers in version regexp"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [releng] Revert "convert-to-tarballs: Include prerelease identifiers in version regexp"
- Date: Fri, 16 Nov 2018 11:34:30 +0000 (UTC)
commit 33472190b7d62917b2e7c36329482acc9f3c6de2
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Fri Nov 16 05:33:43 2018 -0600
Revert "convert-to-tarballs: Include prerelease identifiers in version regexp"
This reverts commit 97016f2f3b66199d726b48ded290cf5f120b5052.
Our ftpadmin script can't handle these either and the resultant release
will be broken if we allow it here.
tools/smoketesting/convert-to-tarballs.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 593be9b..a6d024a 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -638,8 +638,9 @@ class TarballLocator:
# Only include tarballs for the given module
tarballs = [tarball for tarball in tarballs if modulename in tarball]
- re_tarball = r'^'+re.escape(modulename)+'[_-](([0-9]+[\.\-])*[0-9]+[^0-9\.]?[^\.]*)(\.orig)?\.tar.*$'
- ## filter tarballs that have a
+ re_tarball = r'^'+re.escape(modulename)+'[_-](([0-9]+[\.\-])*[0-9]+)(\.orig)?\.tar.*$'
+ ## Don't include -beta -installer -stub-installer and all kinds of
+ ## other stupid inane tarballs, and also filter tarballs that have a
## name that includes the module name but is different (eg, Gnome2-VFS
## instead of Gnome2)
tarballs = filter(lambda t: re.search(re_tarball, t), tarballs)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]