Unverified Commit 8f9d7e5e authored by Austin Horstman's avatar Austin Horstman
Browse files

nixpkgs-plugin-update: avoid mutating cached plugins on cache hits 

Cache entries are seeded from current_plugins, so cache hits can return the same
Plugin instances that current_plugin_map uses as the baseline state.

Updating those objects in place mutates the "old" plugin data during the run.
That can hide version changes and breaks alias handling when multiple plugin
specs resolve to the same cached source. Return a replaced Plugin instead of
mutating the cached instance.
parent 10573a35

pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py

+13 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import traceback 
import urllib.error

import urllib.request

import xml.etree.ElementTree as ET

from dataclasses import asdict, dataclass

from dataclasses import asdict, dataclass, replace

from datetime import datetime, date

from functools import wraps

from multiprocessing.dummy import Pool
@@ -1108,13 +1108,18 @@ def prefetch_plugin( 
    cached_plugin = cache[target_cache_key(p.repo.uri, commit, source_tag)] if cache else None

    if cached_plugin is not None:

        log.debug(f"Cache hit for {p.name}!")

        cached_plugin.name = p.name

        cached_plugin.commit = commit

        cached_plugin.version = version

        cached_plugin.date = date

        cached_plugin.last_tag = latest_tag

        cached_plugin.tag = source_tag

        return cached_plugin, p.repo.redirect

        return (

            replace(

                cached_plugin,

                name=p.name,

                commit=commit,

                version=version,

                date=date,

                last_tag=latest_tag,

                tag=source_tag,

            ),

            p.repo.redirect,

        )



    has_submodules = p.repo.has_submodules()

    log.debug(f"prefetch {p.name}")