Skip to content

Commit

Permalink
Fix bug in RPM replay by filtering out GPG keys
Browse files Browse the repository at this point in the history
Summary: If a user's desired RPM installs new gpg keys, they will be captured as a NEVRA that we need to install in RPM replay, which trips when running `dnf install` on it. Let's filter out GPG key tracking altogether to avoid this.

Test Plan: `hg co D47424634` then `buck2 run //tupperware/cm/antlir/tests:tw.coreviz.mercator=publish` succeeds with this change, not without it

Reviewed By: sergeyfd

Differential Revision: D47424126

fbshipit-source-id: ebf5d20c20a0b9c304df03575218260d305edce6
  • Loading branch information
Naveed Golafshani authored and facebook-github-bot committed Jul 14, 2023
1 parent 29d0fe8 commit d06ba4e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion antlir/rpm/replay/subvol_rpm_compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def _gen_nevras_in_subvol(ba_subvol: Subvol, subvol: Subvol) -> Iterator[NEVRA]:
rpm_cp, _ = run_nspawn(opts, PopenArgs(stdout=subprocess.PIPE))
for nevra_str in rpm_cp.stdout.decode().split():
n, e, v, r, a = nevra_str.split(delim)
yield NEVRA(n, e, v, r, a)
if n != "gpg-pubkey":
yield NEVRA(n, e, v, r, a)


def _gen_nevras_from_installer_output(
Expand Down

0 comments on commit d06ba4e

Please sign in to comment.