Attachment 295539 Details for Bug 433831 – Update satellite patch to match current internal api

[patch] Update satellite patch to match current internal api

virtinst-0.300.2-satellite-distro-fix.patch (text/plain), 1.54 KB, created by Cole Robinson on 2008-02-21 16:54:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cole Robinson

Created: 2008-02-21 16:54:06 UTC

Size: 1.54 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 433831: 295539