autopatch/java-21-openjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix(autopatch): Removed obsolete replace action for portablesuffix — the upstream spec refactor now naturally produces el8 for AlmaLinux #2

Merged
eabdullin merged 2 commits from agent-fix/a9-20260723-033759 into a9 2026-07-23 07:37:46 +00:00
Conversation 0 Commits 2 Files Changed 1 +3 -7
eabdullin commented 2026-07-23 03:38:00 +00:00
Owner
Copy Link

Automated fix by autopatch agent.

Summary: Removed obsolete replace action for portablesuffix — the upstream spec refactor now naturally produces el8 for AlmaLinux builds.

Root cause

The failing ReplaceAction was searching for %global portablesuffix el9 / %endif to insert an AlmaLinux-specific override (%global portablesuffix el8), but this literal no longer exists in the spec.

The upstream spec was refactored to derive portablesuffix indirectly:

%if 0%{?centos} == 0
%global portablerhel %{?pkgos:7_9}%{!?pkgos:8}
%else
%global portablerhel 9
%endif
%global portablesuffix el%{portablerhel}
  • When %centos is not set (AlmaLinux/RHEL): portablerhel = 8 → portablesuffix = el8
  • When %centos is set (CentOS Stream): portablerhel = 9 → portablesuffix = el9

Since AlmaLinux 9 does not define %centos, it takes the first branch and naturally gets portablesuffix = el8 without any explicit override. The replace action is now clearly obsolete — its intended effect is already produced by the upstream refactored code.

The action was removed from config.yaml. The modify_release and changelog_entry actions remain and applied successfully.

Original error

Type: ActionNotAppliedError

Traceback (most recent call last):
  File "/root/autopatch-tool/src/webserv.py", line 89, in debrand_packages
    result = apply_modifications(
  File "/root/autopatch-tool/src/debranding.py", line 136, in apply_modifications
    config.apply_actions(rpms_working_dir + f"/{package}")
  File "/root/autopatch-tool/src/actions_handler.py", line 938, in apply_actions
    action.execute(Path(package_path))
  File "/root/autopatch-tool/src/actions_handler.py", line 475, in execute
    process_lines(
  File "/root/autopatch-tool/src/actions_handler.py", line 236, in process_lines
    raise ActionNotAppliedError(
actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['%global portablesuffix el9', '%endif']' in /root/autopatch-tool/src/autopatch-java-21-openjdk-ji_3_h6t/rpms-namespace/java-21-openjdk/SPECS/java-21-openjdk.spec

Package: java-21-openjdk | Webhook branch: c9

Automated fix by autopatch agent. **Summary:** Removed obsolete replace action for portablesuffix — the upstream spec refactor now naturally produces el8 for AlmaLinux builds. ### Root cause The failing `ReplaceAction` was searching for `%global portablesuffix el9` / `%endif` to insert an AlmaLinux-specific override (`%global portablesuffix el8`), but this literal no longer exists in the spec. The upstream spec was refactored to derive `portablesuffix` indirectly: ``` %if 0%{?centos} == 0 %global portablerhel %{?pkgos:7_9}%{!?pkgos:8} %else %global portablerhel 9 %endif %global portablesuffix el%{portablerhel} ``` - When `%centos` is **not** set (AlmaLinux/RHEL): `portablerhel = 8` → `portablesuffix = el8` - When `%centos` **is** set (CentOS Stream): `portablerhel = 9` → `portablesuffix = el9` Since AlmaLinux 9 does not define `%centos`, it takes the first branch and naturally gets `portablesuffix = el8` without any explicit override. The replace action is now **clearly obsolete** — its intended effect is already produced by the upstream refactored code. The action was removed from `config.yaml`. The `modify_release` and `changelog_entry` actions remain and applied successfully. ### Original error **Type:** `ActionNotAppliedError` ``` Traceback (most recent call last): File "/root/autopatch-tool/src/webserv.py", line 89, in debrand_packages result = apply_modifications( File "/root/autopatch-tool/src/debranding.py", line 136, in apply_modifications config.apply_actions(rpms_working_dir + f"/{package}") File "/root/autopatch-tool/src/actions_handler.py", line 938, in apply_actions action.execute(Path(package_path)) File "/root/autopatch-tool/src/actions_handler.py", line 475, in execute process_lines( File "/root/autopatch-tool/src/actions_handler.py", line 236, in process_lines raise ActionNotAppliedError( actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['%global portablesuffix el9', '%endif']' in /root/autopatch-tool/src/autopatch-java-21-openjdk-ji_3_h6t/rpms-namespace/java-21-openjdk/SPECS/java-21-openjdk.spec ``` --- Package: `java-21-openjdk` | Webhook branch: `c9`
eabdullin added 1 commit 2026-07-23 03:38:00 +00:00 
Removed obsolete replace action for portablesuffix — the upstream spec refactor now naturally produces el8 for AlmaLinux builds.
eabdullin added 1 commit 2026-07-23 07:34:39 +00:00 
almalinux-release defines the %centos macro (%centos %{major}), so the
upstream spec's `%if 0%{?centos} == 0` test treats AlmaLinux as CentOS
and sets portablesuffix to el9. AlmaLinux must consume the el8 portable
packages (like RHEL), so the previous action was NOT obsolete — dropping
it left the "Set portablesuffix to el8" changelog with nothing setting it.

Re-add the `%if 0%{?almalinux}` -> el8 override, anchored on the stable
`%global portablebuilddir /builddir/build/BUILD` line (matching the a10s
and a10 branch configs) instead of the fragile portablesuffix/%endif anchor.
eabdullin merged commit 4cec64a873 into a9 2026-07-23 07:37:46 +00:00
eabdullin deleted branch agent-fix/a9-20260723-033759 2026-07-23 07:37:46 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: autopatch/java-21-openjdk#2
No description provided.
Delete Branch "agent-fix/a9-20260723-033759"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?