[PATCH 2/2] add ability to specify arch for fedora repos

[Peter Robinson]

---
 examples/f14-xo1.5.ini            |    1 +
 examples/f14-xo1.ini              |    1 +
 examples/olpc-os-11.2.0-xo1.5.ini |    1 +
 examples/olpc-os-11.2.0-xo1.ini   |    1 +
 modules/repos/ksmain.50.repos.py  |    9 +++++----
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/examples/f14-xo1.5.ini b/examples/f14-xo1.5.ini
index a3460d4..d082d25 100644
--- a/examples/f14-xo1.5.ini
+++ b/examples/f14-xo1.5.ini
@@ -1,5 +1,6 @@
 [global]
 fedora_release=14
+fedora_arch=i386
 olpc_version_major=11
 olpc_version_minor=3
 olpc_version_release=0
diff --git a/examples/f14-xo1.ini b/examples/f14-xo1.ini
index 813fcc0..af319cc 100644
--- a/examples/f14-xo1.ini
+++ b/examples/f14-xo1.ini
@@ -1,5 +1,6 @@
 [global]
 fedora_release=14
+feora_arch=i386
 olpc_version_major=11
 olpc_version_minor=3
 olpc_version_release=0
diff --git a/examples/olpc-os-11.2.0-xo1.5.ini b/examples/olpc-os-11.2.0-xo1.5.ini
index 6783212..11a116a 100644
--- a/examples/olpc-os-11.2.0-xo1.5.ini
+++ b/examples/olpc-os-11.2.0-xo1.5.ini
@@ -1,5 +1,6 @@
 [global]
 fedora_release=14
+fedora_arch=i386
 olpc_version_major=11
 olpc_version_minor=2
 olpc_version_release=0
diff --git a/examples/olpc-os-11.2.0-xo1.ini b/examples/olpc-os-11.2.0-xo1.ini
index 16b331f..2f550f9 100644
--- a/examples/olpc-os-11.2.0-xo1.ini
+++ b/examples/olpc-os-11.2.0-xo1.ini
@@ -1,5 +1,6 @@
 [global]
 fedora_release=14
+fedora_arch=i386
 olpc_version_major=11
 olpc_version_minor=2
 olpc_version_release=0
diff --git a/modules/repos/ksmain.50.repos.py b/modules/repos/ksmain.50.repos.py
index 4f473ea..8cc6f9b 100644
--- a/modules/repos/ksmain.50.repos.py
+++ b/modules/repos/ksmain.50.repos.py
@@ -25,6 +25,7 @@ excludepkgs = set()
 addexcludes = ooblib.read_config('repos', 'add_excludes_to')
 fedora = ooblib.read_config('repos', 'fedora')
 fver = ooblib.read_config('global', 'fedora_release').strip()
+farch = ooblib.read_config('global', 'fedora_arch').strip()
 
 # clean up addexcludes list
 if addexcludes is not None:
@@ -64,13 +65,13 @@ if fedora is not None:
     for repo in fedora.split(','):
         repo = repo.strip()
         if repo == "fedora":
-            repos["fedora"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-%s&arch=i386" % fver)
+            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=i386" % fver)
+            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=i386" % fver)
+            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=i386")
+            repos["rawhide"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=%s" (fver, farch))
 
 # generate repo lines including excludes
 excludepkgs = list(excludepkgs)
-- 
1.7.6