New: [rhinstaller/anaconda/pulls/356 rhel7-branch] Allow an addon to provide a full url for variant resources

[dashea]

The attached patch will allow a variant to provide a full url for its resources.  Users of respin media or rebuilds (such as CentOS and Scientific) could utilize this to populate some community resources within the interactive install environment.

[rhel7-branch 1/1] Allow an addon to provide a full url for variant resources

[dashea]

From: Pat Riehecky

---
 pyanaconda/packaging/yumpayload.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index ff7ef14..978a1bf 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -776,7 +776,12 @@ def _getAddons(self, baseurl, proxy_url, sslverify):
             if not c.has_section(addonSection) or c.get(addonSection, "type") != "addon" or not c.has_option(addonSection, "repository"):
                 continue

-            url = "%s/%s" % (baseurl, c.get(addonSection, "repository"))
+            repo_location = c.get(addonSection, "repository")
+            if repo_location.startswith(('https://', 'http://', 'ftp://')):
+                log.debug("Addon %s uses full url: %s", addon, repo_location)
+                url = repo_location
+            else:
+                url = "%s/%s" % (baseurl, repo_location))
             retval.append((addon, c.get(addonSection, "name"), url))

return retval

[rhel7-branch 1/1] Allow an addon to provide a full url for variant resources

[dashea]

This is specific to rhel7-branch, yeah?  Is there an open bug for this?  In general, we can't really do things in rhel7-branch without an associated bug that makes its way through the process.

[rhinstaller/anaconda/pulls/356 rhel7-branch] Allow an addon to provide a full url for variant resources

[dashea]

Sorry for the delay in reply, this got lost in my email shuffle.

https://bugzilla.redhat.com/show_bug.cgi?id=1285120

[rhinstaller/anaconda/pulls/356 rhel7-branch] Allow an addon to provide a full url for variant resources

[dashea]

Added label: rhel7-branch.

[rhinstaller/anaconda/pulls/356 rhel7-branch] Allow an addon to provide a full url for variant resources

[dashea]

> @@ -776,7 +776,12 @@ def _getAddons(self, baseurl, proxy_url, sslverify):
>              if not c.has_section(addonSection) or c.get(addonSection, "type") != "addon" or not c.has_option(addonSection, "repository"):
>                  continue
>        url = "%s/%s" % (baseurl, c.get(addonSection, "repository"))
>        repo_location = c.get(addonSection, "repository")
>        if repo_location.startswith(('https://', 'http://', 'ftp://')):
>            log.debug("Addon %s uses full url: %s", addon, repo_location)
>            url = repo_location
>        else:
>            url = "%s/%s" % (baseurl, repo_location))

Hi, could you please fix this line.
You have here one missing or one extra bracket.