diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 15:54:58 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 15:54:58 +0000 |
| commit | 1e51c4dafba3bd5f775c1568d1b6c45cc56df5c9 (patch) | |
| tree | 594647cce15386b83e5e5b9d6a48bd9c7e11e008 | |
| parent | Using wget instead of curl for improved reliability with poor connections. (diff) | |
| download | devscripts-1e51c4dafba3bd5f775c1568d1b6c45cc56df5c9.tar.xz devscripts-1e51c4dafba3bd5f775c1568d1b6c45cc56df5c9.zip | |
Updating PEP440 version handling to fix FTBFS with Progress Linux versions.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/patches/progress-linux/0002-pep440.patch | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0002-pep440.patch b/debian/patches/progress-linux/0002-pep440.patch new file mode 100644 index 0000000..b048b68 --- /dev/null +++ b/debian/patches/progress-linux/0002-pep440.patch @@ -0,0 +1,14 @@ +Author: Daniel Baumann <daniel.baumann@progress-linux.org> +Description: Updating PEP440 version handling to fix FTBFS with Progress Linux versions. + +diff -Naurp devscripts.orig/scripts/setup.py devscripts/scripts/setup.py +--- devscripts.orig/scripts/setup.py ++++ devscripts/scripts/setup.py +@@ -27,6 +27,7 @@ def make_pep440_compliant(version: str) + if not local: + return version + sanitized_local = re.sub("[+~]+", ".", local).strip(".") ++ sanitized_local = re.sub("-", ".", sanitized_local).strip(".") + pep440_version = f"{public}+{sanitized_local}" + assert re.match( + "^[a-zA-Z0-9.]+$", sanitized_local diff --git a/debian/patches/series b/debian/patches/series index 8a36847..80b5737 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ progress-linux/0001-wget.patch +progress-linux/0002-pep440.patch |