Diff:
---
calm/hint.py | 1 +
calm/package.py | 10 +++++++---
calm/past_mistakes.py | 22 ----------------------
test/test_calm.py | 2 +-
test/testdata/htdocs.expected/summary/rpm-doc.html | 2 +-
5 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/calm/hint.py b/calm/hint.py
index 7e9f66b..5f274f0 100755
--- a/calm/hint.py
+++ b/calm/hint.py
@@ -64,6 +64,7 @@ commonkeys = {
'sdesc': 'val',
'test': 'noval', # mark the package as a test version
'version': 'val', # version override
+ 'epoch': 'val', # epoch
'disable-check': 'val',
'notes': 'val', # tool notes; not significant to calm itself
}
diff --git a/calm/package.py b/calm/package.py
index 50ed906..c772199 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -583,6 +583,11 @@ def read_one_package(packages, p, basedir, files, kind,
strict):
ovr = pvr_hint['version']
# also record the version before the override
pvr_hint['original-version'] = vr
+ # add epoch to version
+ elif 'epoch' in pvr_hint:
+ ovr = pvr_hint['epoch'] + ':' + vr
+ # also record the version before the override
+ pvr_hint['original-version'] = vr
else:
ovr = vr
@@ -935,8 +940,7 @@ def validate_packages(args, packages,
valid_provides_extra=None, missing_obsolet
# don't consider an equal mtime to be more recent
continue
- if ((p in past_mistakes.mtime_anomalies) or
- ('curr-most-recent' in
packages[p].override_hints.get('disable-check', '')) or
+ if (('curr-most-recent' in
packages[p].override_hints.get('disable-check', '')) or
('curr-most-recent' in getattr(args, 'disable_check',
[]))):
lvl = logging.DEBUG
else:
@@ -1726,7 +1730,7 @@ def mark_fn(packages, po, v, certain_age, obs_threshold,
vault_requests):
#
SO_AGE_THRESHOLD_YEARS = 5
-OBSOLETE_AGE_THRESHOLD_YEARS = 7
+OBSOLETE_AGE_THRESHOLD_YEARS = 2
def stale_packages(packages, vault_requests):
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 9304161..a765074 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -37,17 +37,9 @@ illegal_char_in_version = {
'gendef': ['1.0-svn2931'],
'gendef-debuginfo': ['1.0-svn2931'],
'gt5': ['1.5.0~20111220+bzr29'],
- 'hidapi': ['0.8.0-rc1'],
- 'hidapi-debuginfo': ['0.8.0-rc1'],
- 'libhidapi-devel': ['0.8.0-rc1'],
- 'libhidapi0': ['0.8.0-rc1'],
'libmangle': ['1.0-svn2930'],
'libmangle-debuginfo': ['1.0-svn2930'],
'man-pages-posix': ['2013-a'],
- 'mingw64-i686-hidapi': ['0.8.0-rc1'],
- 'mingw64-i686-hidapi-debuginfo': ['0.8.0-rc1'],
- 'mingw64-x86_64-hidapi': ['0.8.0-rc1'],
- 'mingw64-x86_64-hidapi-debuginfo': ['0.8.0-rc1'],
'recode': ['3.7-beta2'],
'recode-debuginfo': ['3.7-beta2'],
}
@@ -62,7 +54,6 @@ self_requires = [
# function as their own source
self_source = [
'R_autorebase',
- '_update-info-dir',
'base-cygwin',
'chere',
'cygcheck-dep',
@@ -108,22 +99,9 @@ nonunique_versions = [
# don't add to this list, use 'disable-check: empty-obsolete' in pvr.hint
instead
empty_but_not_obsolete = {
'isl': ['0.16.1-1'], # useless empty
package, not autosupressed as it has depends
- 'libpopt-devel': ['1.16-1'], # version 1.16-1
was empty (x86_64)
- 'libpopt0': ['1.16-1'], # version 1.16-1
was empty
'mbedtls': ['2.16.0-1'], # useless empty
package, not autosupressed as it has depends
- 'mpclib': ['1.1.0-1'], # useless empty
package, not autosupressed as it has depends
- 'mpfr': ['4.0.2-1'], # useless empty
package, not autosupressed as it has depends
- 'serf-debuginfo': ['1.3.8-1', '1.3.9-1'], # empty presumably
due to build problems
}
-# packages with timestamp anomalies
-#
-# don't add to this list, use 'disable-check: curr-most-recent' in
override.hint instead
-mtime_anomalies = [
- 'gcc-tools-epoch2-autoconf',
- 'gcc-tools-epoch2-autoconf-src',
-]
-
# packages with maintainer anomalies
#
# don't add to this list, fix the package
diff --git a/test/test_calm.py b/test/test_calm.py
index 78effd1..e09b95a 100755
--- a/test/test_calm.py
+++ b/test/test_calm.py
@@ -542,7 +542,7 @@ class CalmTest(unittest.TestCase):
(os.path.join(relarea_arch, 'per-version',
'per-version-4.0-1-src.tar.xz'), '2017-04-09'),
(os.path.join(relarea_arch, 'rpm-doc',
'rpm-doc-4.1-2.tar.bz2'), '2016-11-02'),
(os.path.join(relarea_arch, 'rpm-doc',
'rpm-doc-4.1-2-src.tar.bz2'), '2016-11-02'),
- (os.path.join(relarea_arch, 'rpm-doc',
'rpm-doc-999-1.tar.bz2'), '2019-03-02'),
+ (os.path.join(relarea_arch, 'rpm-doc',
'rpm-doc-999-1.tar.bz2'), '2024-03-02'),
(os.path.join(relarea_arch, 'staleversion',
'staleversion-240-1.tar.xz'), '2017-04-07'),
(os.path.join(relarea_arch, 'staleversion',
'staleversion-240-1-src.tar.xz'), '2017-04-07'),
(os.path.join(relarea_arch, 'staleversion',
'staleversion-242-0.tar.xz'), '2017-04-08'),
diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html
b/test/testdata/htdocs.expected/summary/rpm-doc.html
index 7a02078..49303c1 100755
--- a/test/testdata/htdocs.expected/summary/rpm-doc.html
+++ b/test/testdata/htdocs.expected/summary/rpm-doc.html
@@ -19,7 +19,7 @@
<table class="pkgtable">
<tr><th>Version</th><th>Arch</th><th>Package
Size</th><th>Date</th><th>Files</th><th>Status</th></tr>
<tr><td>4.1-2</td><td>x86_64</td><td class="right">50 KiB</td><td>2016-11-02
00:00</td><td>[<a href="../x86_64/rpm-doc/rpm-doc-4.1-2">list of
files</a>]</td><td>stable</td></tr>
-<tr><td>999-1</td><td>x86_64</td><td class="right">1 KiB</td><td>2019-03-02
00:00</td><td>[<a href="../x86_64/rpm-doc/rpm-doc-999-1">list of
files</a>]</td><td>stable</td></tr>
+<tr><td>999-1</td><td>x86_64</td><td class="right">1 KiB</td><td>2024-03-02
00:00</td><td>[<a href="../x86_64/rpm-doc/rpm-doc-999-1">list of
files</a>]</td><td>stable</td></tr>
</table><br>
</div>
</body>
[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20250329-24-g4dc068f
Jon Turney via Cygwin-apps-cvs Fri, 31 Oct 2025 09:15:20 -0700
