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

(cherry picked from commit e1ab8bb)
uyuni-project · Oct 2, 2023 · db28e85 · db28e85
1 parent d2eb86d
commit db28e85
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/java/code/src/com/redhat/rhn/manager/contentmgmt/ContentManager.java b/java/code/src/com/redhat/rhn/manager/contentmgmt/ContentManager.java
@@ -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}
      *
@@ -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;
     }
 

diff --git a/java/spacewalk-java.changes.cbbayburt.bsc1213689 b/java/spacewalk-java.changes.cbbayburt.bsc1213689
@@ -0,0 +1 @@
+- Sync GPG properties on each build in CLM (bsc#1213689)