|
 |
1b0634d |
diff -rup virtinst-0.300.2.orig/virtinst/DistroManager.py virtinst-0.300.2/virtinst/DistroManager.py
|
|
|
1b0634d |
--- virtinst-0.300.2.orig/virtinst/DistroManager.py 2008-02-21 11:33:41.000000000 -0500
|
|
|
1b0634d |
+++ virtinst-0.300.2/virtinst/DistroManager.py 2008-02-21 11:34:49.000000000 -0500
|
|
|
1b0634d |
@@ -57,22 +57,22 @@ def _fetcherForURI(uri, scratchdir=None)
|
|
|
1b0634d |
# Used as a workaround for Satellite issue
|
|
|
1b0634d |
def _checkRHDistro(fetcher, baseuri, type, progresscb, distro=None, scratchdir=None):
|
|
|
1b0634d |
# Check for fedora distro
|
|
|
1b0634d |
- store = FedoraImageStore(baseuri, type, scratchdir)
|
|
|
1b0634d |
+ store = FedoraDistro(baseuri, type, scratchdir)
|
|
|
1b0634d |
if store.isValidStore(fetcher, progresscb):
|
|
|
1b0634d |
return store
|
|
|
1b0634d |
# Check for CentOS?
|
|
|
1b0634d |
if fetcher.hasFile("centosdocs-man.css", progresscb):
|
|
|
1b0634d |
logging.debug("Detected a CentOS distro")
|
|
|
1b0634d |
- return CentOSImageStore(baseuri, type, scratchdir)
|
|
|
1b0634d |
+ return CentOSDistro(baseuri, type, scratchdir)
|
|
|
1b0634d |
# Check for RHEL-5
|
|
|
1b0634d |
if fetcher.hasFile("RPM-GPG-KEY-redhat-release", progresscb):
|
|
|
1b0634d |
logging.debug("Detected a RHEL-5 distro")
|
|
|
1b0634d |
- return RHELImageStore(baseuri, type, scratchdir)
|
|
|
1b0634d |
+ return RHELDistro(baseuri, type, scratchdir)
|
|
|
1b0634d |
# Check for RHEL-4
|
|
|
1b0634d |
if fetcher.hasFile("autorun", progresscb) and \
|
|
|
1b0634d |
fetcher.hasFile("RPM-GPG-KEY", progresscb):
|
|
|
1b0634d |
logging.debug("Detected a RHEL-4 distro")
|
|
|
1b0634d |
- return RHELImageStore(baseuri, type, scratchdir)
|
|
|
1b0634d |
+ return RHELDistro(baseuri, type, scratchdir)
|
|
|
1b0634d |
return False
|
|
|
1b0634d |
|
|
|
1b0634d |
def _storeForDistro(fetcher, baseuri, type, progresscb, distro=None, scratchdir=None):
|