# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1241725806 14400
# Node ID 9768e52d4d624f83853f7f23f85402c8a078eb6f
# Parent  94be2c80832ae1019cc1b3099636a5cb41dd6094
Fix os_variant autodetection for F11-{alpha/beta/preview}

Prevents URL installs for the stated releases, unless an --os-variant is
manually specified.

diff -r 94be2c80832a -r 9768e52d4d62 tests/urltest.py
--- a/tests/urltest.py	Thu May 07 13:47:49 2009 -0400
+++ b/tests/urltest.py	Thu May 07 15:50:06 2009 -0400
@@ -108,6 +108,11 @@
         'x86_64': FEDORA_BASEURL % ("10", "x86_64"),
         'distro': ("linux", "fedora10")
     },
+    "fedora11test" : {
+        'i386'  : FEDORA_BASEURL % ("test/11-Preview", "i386"),
+        'x86_64': FEDORA_BASEURL % ("test/11-Preview", "x86_64"),
+        'distro': ("linux", "fedora11")
+    },
     "fedora-rawhide" : {
         'i386'  : FEDORA_RAWHIDE_BASEURL % ("i386"),
         'x86_64': FEDORA_RAWHIDE_BASEURL % ("x86_64"),
diff -r 94be2c80832a -r 9768e52d4d62 virtinst/OSDistro.py
--- a/virtinst/OSDistro.py	Thu May 07 13:47:49 2009 -0400
+++ b/virtinst/OSDistro.py	Thu May 07 15:50:06 2009 -0400
@@ -429,7 +429,7 @@
                 if ver == "development":
                     self.os_variant = self._latestFedoraVariant()
                 elif ver:
-                    self.os_variant = "fedora" + str(ver)
+                    self.os_variant = "fedora" + (str(ver).split("-"))[0]
 
             return ret
         else: