[PATCH] Add metalink support to yumpayload

[Brian C. Lane]

From: "Brian C. Lane"

Fedora has started using metalink in the default repo config. This
expands into a giant baseurl list. Anaconda was picking the first entry
and writing that to the repo config. This checks for metalink and if
present writes that instead, allowing mirror fallback to work.
---
 pyanaconda/packaging/yumpayload.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 6d7cb05..58c7a13 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -276,10 +276,12 @@ reposdir=%s
                 f.write("enabled=1\n")
                 if repo.mirrorlist:
                     f.write("mirrorlist=%s" % repo.mirrorlist)
+                elif repo.metalink:
+                    f.write("metalink=%s" % repo.metalink)
                 elif repo.baseurl:
                     f.write("baseurl=%s\n" % repo.baseurl[0])
                 else:
-                    log.error("repo %s has no baseurl or mirrorlist", repo.id)
+                    log.error("repo %s has no baseurl, mirrorlist or metalink", repo.id)
                     f.close()
                     os.unlink(cfg_path)
                     continue

[Vratislav Podzimek]

On Tue, 2013-09-17 at 18:12 -0700, Brian C. Lane wrote:
> From: "Brian C. Lane"
>
> Fedora has started using metalink in the default repo config. This
> expands into a giant baseurl list. Anaconda was picking the first entry
> and writing that to the repo config. This checks for metalink and if
> present writes that instead, allowing mirror fallback to work.
>
> pyanaconda/packaging/yumpayload.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
> index 6d7cb05..58c7a13 100644
> --- a/pyanaconda/packaging/yumpayload.py
> +++ b/pyanaconda/packaging/yumpayload.py
> @@ -276,10 +276,12 @@ reposdir=%s
>                  f.write("enabled=1\n")
>                  if repo.mirrorlist:
>                      f.write("mirrorlist=%s" % repo.mirrorlist)
>            elif repo.metalink:
>                f.write("metalink=%s" % repo.metalink)
>            elif repo.baseurl:
>                f.write("baseurl=%s\n" % repo.baseurl[0])
>            else:
>                log.error("repo %s has no baseurl or mirrorlist", repo.id)
>                log.error("repo %s has no baseurl, mirrorlist or metalink", repo.id)
>                f.close()
>                os.unlink(cfg_path)
>                continue

ACK.