From 14ed048dd34600f07adaa324d160b0b211f44361 Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Mon, 2 Nov 2026 22:17:31 +0300 Subject: [PATCH] Read an install recorded as update 1.1.1 as 1.1.0 when the setup updates it Releases before 0.3.1 recorded the 0x20000 update as 1.1.1. After the rename (#371) nothing mapped the recorded name, so an update of such an install asked make_romfs_patches.py for --version v111 and failed at the end (#332); in a fresh setup folder it would not find expected-v1.1.1.json at all. migrate_state maps the old name before the plan and gives the extract record the key of the renamed expected file; the full check of kept output still hashes the extraction against it. Co-Authored-By: Claude Opus 5.5 --- installer/cli.py | 3 ++- installer/steps.py | 19 +++++++++++++++++++ tests/installer_test.py | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/installer/cli.py b/installer/cli.py index f95a0084..1c70d436 100644 --- a/installer/cli.py +++ b/installer/cli.py @@ -19,7 +19,7 @@ from . import layout as layouts from . import state as statefile from .events import Reporter from .runner import Context, run_steps -from .steps import all_steps +from .steps import all_steps, migrate_state EXIT = {'ok': 0, 'failed': 1, 'cancelled': 3} @@ -79,6 +79,7 @@ def main(argv=None): rep.emit('end', result='failed', seconds=0) return 1 ctx = Context(layout, dest, temp, rep, args, state=state, verify=args.verify) + migrate_state(ctx) steps = all_steps() rep.emit('start', release=layout.release, mode=ctx.mode, dev=layout.dev, dest=str(dest), log=str(log), steps=[s.id for s in steps]) diff --git a/installer/steps.py b/installer/steps.py index 4c9f2ea5..e9d6dff5 100644 --- a/installer/steps.py +++ b/installer/steps.py @@ -184,6 +184,25 @@ def expected_update(ctx): return extract.load_expected()[game_version(ctx)] +# Releases before 0.3.1 recorded the 0x20000 update as 1.1.1 (pull request #220); it is 1.1.0 (#371), with the same +# files, hashes and patch sites under new names. +RENAMED_VERSIONS = {'1.1.1': '1.1.0'} + + +def migrate_state(ctx): + """Read a recorded update by its current name. The extraction it recorded stays: its record gets the key of the + renamed expected file, and Extract.current and the full check of output another release kept + (runner.Context.verify_kept) still test the files against the expected hashes.""" + old = ctx.state.get('version') + if old not in RENAMED_VERSIONS: + return + ctx.state['version'] = RENAMED_VERSIONS[old] + record = ctx.state['steps'].get('extract') + if record: + record['key'] = Extract().key(ctx) + ctx.reporter.log(f'state: the update recorded as {old} is {ctx.state["version"]}') + + def shader_list_text(layout): if layout.shader_list: return layout.shader_list.read_text(encoding='utf-8') diff --git a/tests/installer_test.py b/tests/installer_test.py index 0408fd90..33e651b4 100644 --- a/tests/installer_test.py +++ b/tests/installer_test.py @@ -209,6 +209,41 @@ class ReleaseFilesTest(unittest.TestCase): self.assertEqual(used - set(make_release.TOOLS_FILES), set()) +class RenamedVersionTest(unittest.TestCase): + """An install the setup before 0.3.1 recorded as 1.1.1 is the 1.1.0 update (#332).""" + + def setUp(self): + tmp = tempfile.TemporaryDirectory() + self.addCleanup(tmp.cleanup) + root = Path(__file__).resolve().parents[1] + layout = Layout(root=root, dev=True, release='9.9', python=Path('python'), tools=root / 'tools', + recomp=root / 'recomp', llvm=Path('llvm'), deps=Path('deps'), runtime=Path('rt'), + runtime_lib=Path('lib'), ninja=Path('ninja'), hactool=Path('hactool'), xlate=Path('xlate')) + state = {'format': 1, 'release': '0.2.8', 'version': '1.1.1', 'inputs': {}, + 'steps': {'extract': {'key': 'recorded by 0.2.8', 'release': '0.2.8'}}} + out = io.StringIO() + self.ctx = runner.Context(layout, Path(tmp.name), Path(tmp.name), Reporter(out=out), SimpleNamespace(), + state=state) + + def test_old_name_is_read_as_1_1_0(self): + steps.migrate_state(self.ctx) + self.assertEqual(steps.game_version(self.ctx), '1.1.0') + self.assertEqual(steps.version_tag(steps.game_version(self.ctx)), 'v110') + self.assertEqual(steps.expected_update(self.ctx)['display_version'], '1.1.0') + self.assertTrue(self.ctx.layout.patches(steps.game_version(self.ctx)).is_file()) + + def test_extraction_is_kept_under_the_new_name(self): + steps.migrate_state(self.ctx) + self.assertEqual(self.ctx.state['steps']['extract']['key'], steps.Extract().key(self.ctx)) + self.assertEqual(self.ctx.state['steps']['extract']['release'], '0.2.8') # full check of kept output runs + + def test_other_versions_are_untouched(self): + self.ctx.state['version'] = '1.4.3' + steps.migrate_state(self.ctx) + self.assertEqual(self.ctx.state['version'], '1.4.3') + self.assertEqual(self.ctx.state['steps']['extract']['key'], 'recorded by 0.2.8') + + class LiftKeyTest(unittest.TestCase): def setUp(self): tmp = tempfile.TemporaryDirectory()