Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync GPG properties on each build in CLM (bsc#1213689) #7572

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Sync GPG properties on each build in CLM (bsc#1213689) #7572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions java/code/src/com/redhat/rhn/manager/contentmgmt/ContentManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,13 @@ private static void stripModuleMetadata(Channel channel) {
}
}

private static void syncGpgKeyInfo(Channel source, Channel target) {
target.setGPGCheck(source.isGPGCheck());
target.setGPGKeyFp(source.getGPGKeyFp());
target.setGPGKeyId(source.getGPGKeyId());
target.setGPGKeyUrl(source.getGPGKeyUrl());
}

/**
* Clone {@link Channel}s to given {@link ContentEnvironment}
*
Expand Down Expand Up @@ -851,6 +858,9 @@ private static SoftwareEnvironmentTarget fixTargetProperties(SoftwareEnvironment
tgt.cloneModulesFrom(newSource);
}

// Sync GPG key info to target in case it's updated since last build
syncGpgKeyInfo(newSource, tgt);

return swTgt;
}

Expand Down
1 change: 1 addition & 0 deletions java/spacewalk-java.changes.cbbayburt.bsc1213689
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Sync GPG properties on each build in CLM (bsc#1213689)