Skip to content

Simulate mode package fixes (3.24.x) - #6500

Draft
larsewi wants to merge 4 commits into
cfengine:3.24.xfrom
larsewi:simulate-pkg-fixes-3.24.x
Draft

larsewi wants to merge 4 commits into
cfengine:3.24.xfrom
larsewi:simulate-pkg-fixes-3.24.x

Conversation

@larsewi

@larsewi larsewi commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

Backport of #6333, #6389, #6412 and #6424 to 3.24.x.

🤖 Generated with Claude Code

@larsewi

larsewi commented Nov 12, 2026

Copy link
Copy Markdown
Contributor Author

@cf-bottom Jenkins with exotics please :)

larsewi and others added 4 commits November 12, 2026 12:35
Each call to RecordPkgOperationInChroot passed version followed by
architecture in the arguments. However, the function signature had this
the other way around. To avoid any change in behavior, I changed the
parameter names to match the arguments of the call sites.

Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
(cherry picked from commit d858268)
RecordPkgOperationInChroot() wrote the architecture before the version,
the reverse of the order its readers expect.

Ticket: none
Changelog: Title
Signed-off-by: Daniel JB Clark <djbclark@gmail.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
(cherry picked from commit a5a6b6b)
A recorded removal with a version was only reported when it cancelled a
recorded installation of the same version.

Ticket: none
Changelog: Title
Signed-off-by: Daniel JB Clark <djbclark@gmail.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
(cherry picked from commit eb6cf5f)
…talls

DiffPkgOperations() compared the versions of two recorded installations
of the same package without checking that both were set, which
PkgVersionIsGreater() asserts. The diff report now keeps the record the
way the manifest report does: a versioned record over an unversioned
one, otherwise the higher version, otherwise the first one recorded.

Ticket: none
Changelog: Title
Signed-off-by: Daniel JB Clark <djbclark@gmail.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit ab0408f)
@larsewi
larsewi force-pushed the simulate-pkg-fixes-3.24.x branch from 5ca3c4f to a0cd87e Compare November 12, 2026 11:35
@cfengine cfengine deleted a comment from cf-bottom Nov 12, 2026
@cf-bottom

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants