Hi,
Would you consider this too simplistic?
BR,
Gábor
From 570eb22e809964a7cce67987d2d962705f03188b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20N=C3=A9meth?= <ho...@riseup.net>
Date: Mon, 16 Jan 2023 10:22:17 +0100
Subject: [PATCH] Do not vary time by default
Previous behavior used to break stuff like [1], so we remove 'time'
from the list of default variations. It still can be turned on by the
user.
[1] https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1855912.html
---
reprotest/__init__.py | 6 +++---
reprotest/build.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index f752f7f..b7de7ad 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -569,10 +569,10 @@ def cli_parser():
'non-existent. Otherwise, the artifacts will be deleted and you only '
'see their hashes (if reproducible) or the diff output (if not). See '
'also --no-clean-on-error.')
- group1.add_argument('--variations', default="+all",
+ group1.add_argument('--variations', default="+all-time",
help='Build variations to test as a comma-separated list of variation '
- 'names. Default is "+all", equivalent to "%s", testing all available '
- 'variations. See the man page section on VARIATIONS for more advanced '
+ 'names. Default is "+all-time", equivalent to "%s", testing all available '
+ 'variations except "time". See the man page section on VARIATIONS for more advanced '
'syntax options, including tweaking how certain variations work.' %
VariationSpec.default_long_string())
group1.add_argument('--vary', metavar='VARIATIONS', default=[], action='append',
diff --git a/reprotest/build.py b/reprotest/build.py
index affb57d..c25d8db 100644
--- a/reprotest/build.py
+++ b/reprotest/build.py
@@ -579,7 +579,7 @@ class DomainHostVariation(collections.namedtuple('_DomainHostVariation', 'use_su
class VariationSpec(mdiffconf.ImmutableNamespace):
@classmethod
- def default(cls, variations=VARIATIONS):
+ def default(cls, variations={k:v for k,v in VARIATIONS.items() if k != 'time'}):
default_overrides = {
"environment": EnvironmentVariation.default(),
"user_group": UserGroupVariation.default(),
@@ -591,7 +591,7 @@ class VariationSpec(mdiffconf.ImmutableNamespace):
@classmethod
def default_long_string(cls):
actions = cls.default().actions()
- return ", ".join("+" + a[0] for a in actions)
+ return ", ".join("+" + a[0] for a in actions if a[1])
@classmethod
def empty(cls):
--
2.39.0
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/reproducible-builds
