diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java index 252a46a1056a..718ccfec6e53 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java @@ -521,7 +521,7 @@ private List listProductsImpl() { */ private void refreshRepositoriesAuthentication(String mirrorUrl, boolean excludeSCC) throws ContentSyncException { List credentials = filterCredentials(); - + Exception syncException = null; ChannelFactory.cleanupOrphanVendorContentSource(); // Query repos for all mirror credentials and consolidate @@ -540,11 +540,11 @@ private void refreshRepositoriesAuthentication(String mirrorUrl, boolean exclude // test for OES credentials if (c == null || !accessibleUrl(OES_URL, c.getUsername(), c.getPassword())) { LOG.info("Credential is not an OES credentials"); - throw new ContentSyncException(e); + syncException = e; } } catch (URISyntaxException e) { - throw new ContentSyncException(e); + syncException = e; } } else if (c.isTypeOf(Credentials.TYPE_CLOUD_RMT)) { @@ -564,6 +564,10 @@ else if (c.isTypeOf(Credentials.TYPE_CLOUD_RMT)) { ensureSUSEProductChannelData(); linkAndRefreshContentSource(mirrorUrl); ManagerInfoFactory.setLastMgrSyncRefresh(); + + if (syncException != null) { + throw new ContentSyncException(syncException); + } } /** diff --git a/java/spacewalk-java.changes.mseidl.Manager-4.3-fix-scc-badcred b/java/spacewalk-java.changes.mseidl.Manager-4.3-fix-scc-badcred new file mode 100644 index 000000000000..04d4bae90850 --- /dev/null +++ b/java/spacewalk-java.changes.mseidl.Manager-4.3-fix-scc-badcred @@ -0,0 +1 @@ +- Fix issue where bad scc creds were preventing other credentials to refresh (bsc#1211355)