Bug#990632: unblock: fdroidserver/2.0.3-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package fdroidserver
[ Reason ]
fdroidserver has successful autopkgtests but fails on ppc64el due to
zipalign not being available on that platform (Not a regression). I
believe that is #980087.
For the patch itself, it fixes two warnings in the linting part of
fdroidserver. ruamel deprecated one function and a restriction for the
Version field in the F-Droid metadata was lifted.
Note that I opted for a new upstream version cause adding those two
change would have resulted in basically the same patch plus/minus the
version noise. Hope that is fine.
[ Impact ]
bullseye users would would get a lot of false warnings when linting a
metadata file.
[ Tests ]
I tested the new version manually. Also upstream is using it in
production.
[ Risks ]
The code change for the Version field is only changing a regex so it
seems trivial to me. For ruamel the deprecated function was replaced by
it's content.
[ Checklist ]
[X] all changes are documented in the d/changelog (through upstream
changelog)
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock fdroidserver/2.0.3-1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99a5f430..945e237c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,21 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
-## [2.0.1] - 2020-03-09
+## [2.0.3] - 2021-07-01
+
+### Fixed
+
+* Support AutoUpdateMode: Version without pattern
+ [931](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/931)
+
+## [2.0.2] - 2021-06-01
+
+### Fixed
+
+* fix "ruamel round_trip_dump will be removed"
+ [932](https://gitlab.com/fdroid/fdroidserver/-/merge_requests/932)
+
+## [2.0.1] - 2021-03-09
### Fixed
@@ -18,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* checkupdates: set User-Agent to make gitlab.com happy
* Run push_binary_transparency only once
-## [2.0] - 2020-01-31
+## [2.0] - 2021-01-31
For a more complete overview, see the [2.0
milestone](https://gitlab.com/fdroid/fdroidserver/-/milestones/10)
diff --git a/PKG-INFO b/PKG-INFO
index 1c5616cd..3188aba8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: fdroidserver
-Version: 2.0.1
+Version: 2.0.3
Summary: F-Droid Server Tools
Home-page: https://f-droid.org
Author: The F-Droid Project
diff --git a/debian/changelog b/debian/changelog
index 59e519f1..d45c4c20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fdroidserver (2.0.3-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version 2.0.3
+
+ -- Jochen Sprickerhof <jspricke@debian.org> Thu, 01 Jul 2021 14:48:57 +0200
+
fdroidserver (2.0.1-1) unstable; urgency=medium
* New upstream version 2.0.1
diff --git a/fdroidserver.egg-info/PKG-INFO b/fdroidserver.egg-info/PKG-INFO
index 1c5616cd..3188aba8 100644
--- a/fdroidserver.egg-info/PKG-INFO
+++ b/fdroidserver.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: fdroidserver
-Version: 2.0.1
+Version: 2.0.3
Summary: F-Droid Server Tools
Home-page: https://f-droid.org
Author: The F-Droid Project
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index f5d0d450..b9e723df 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -492,7 +492,7 @@ def checkupdates_app(app):
logging.warning("Can't auto-update app with no CurrentVersionCode: " + app.id)
elif mode in ('None', 'Static'):
pass
- elif mode.startswith('Version '):
+ elif mode.startswith('Version'):
pattern = mode[8:]
suffix = ''
if pattern.startswith('+'):
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 6c3c4815..8b27c991 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -448,7 +448,7 @@ valuetypes = {
["AntiFeatures"]),
FieldValidator("Auto Update Mode",
- r"^(Version .+|None)$",
+ r"^(Version.*|None)$",
["AutoUpdateMode"]),
FieldValidator("Update Check Mode",
@@ -964,7 +964,9 @@ def write_yaml(mf, app):
return builds
yaml_app = _app_to_yaml(app)
- ruamel.yaml.round_trip_dump(yaml_app, mf, indent=4, block_seq_indent=2)
+ yaml = ruamel.yaml.YAML()
+ yaml.indent(mapping=4, sequence=4, offset=2)
+ yaml.dump(yaml_app, stream=mf)
build_line_sep = re.compile(r'(?<!\\),')
diff --git a/setup.py b/setup.py
index 4ba987cd..35243bc1 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ with open("README.md", "r") as fh:
long_description = fh.read()
setup(name='fdroidserver',
- version='2.0.1',
+ version='2.0.3',
description='F-Droid Server Tools',
long_description=long_description,
long_description_content_type='text/markdown',
Reply to: