repos: allow override of Fedora mirror selection

2 files changed, 12 insertions, 13 deletions

diff --git a/modules/repos/README b/modules/repos/README
index b1d9927..c69ef14 100644
--- a/modules/repos/README
+++ b/modules/repos/README
@@ -12,7 +12,7 @@ Firstly, the 'fedora' and 'fedora_arch' options:
 
 [repos]
 fedora_arch=i386
-fedora=fedora,fedora-updates,fedora-updates-testing
+fedora=fedora,fedora_updates,fedora_updates_testing
 
 This is a comma-separated list of official Fedora repositories to enable
 for the build. The 4 possible options are fedora, fedora_updates,
@@ -22,6 +22,17 @@ If using the fedora option, the fedora_arch option must be specified too.
 This specifies the processor architecture to use for Fedora package selection.
 See http://mirrors.fedoraproject.org/ for the available values.
 
+A Fedora mirror is normally automatically selected by yum through Fedora's
+mirrorlist mechanism. If you wish to override the mirror selection choice,
+you can either add the repos as custom repos (see below), or you can use
+"url_" override settings, e.g.:
+
+[repos]
+fedora=fedora,fedora_updates
+fedora_arch=i386
+url_fedora_updates=http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/updates/16/i386/
+url_fedora=http://www.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/16/i386/os/
+
 
 The olpc_frozen_ options:
 
diff --git a/modules/repos/ksmain.50.repos.py b/modules/repos/ksmain.50.repos.py
index 3d39d66..e1dee21 100644
--- a/modules/repos/ksmain.50.repos.py
+++ b/modules/repos/ksmain.50.repos.py
@@ -82,24 +82,12 @@ def get_fedora_repo(name, version, arch):
 
 if fedora is not None:
     for repo in fedora.split(','):
-<<<<<<< HEAD
         repo = repo.strip().replace('-', '_')
         repotype, url = get_fedora_repo(repo, fver, farch)
         if repotype:
             repos[repo] = (repotype, url)
         else:
             print >>sys.stderr, "Unknown Fedora repo:", repo
-=======
-        repo = repo.strip()
-        if repo == "fedora":
-            repos["fedora"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-%s&arch=%s" % (fver, farch))
-        elif repo == "fedora-updates":
-            repos["fedora-updates"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f%s&arch=%s" % (fver, farch))
-        elif repo == "fedora-updates-testing":
-            repos["fedora-updates-testing"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f%s&arch=%s" % (fver, farch))
-        elif repo == "rawhide":
-            repos["rawhide"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=%s" % farch)
->>>>>>> repos: add ability to specify arch for fedora repos
 
 # generate repo lines including excludes
 excludepkgs = list(excludepkgs)