diff options
| author | Paul Nasrat <pnasrat@redhat.com> | 2005-08-31 14:54:47 +0000 |
|---|---|---|
| committer | Paul Nasrat <pnasrat@redhat.com> | 2005-08-31 14:54:47 +0000 |
| commit | 374a06cd523bc57afab8a3532a99258036d83546 (patch) | |
| tree | 29e1cb884eb4f5f3bfe7474c542ab25c364dc714 | |
| parent | 1fc6e0b4ce32474b078d253fe192715a25a7745a (diff) | |
| download | anaconda-374a06cd523bc57afab8a3532a99258036d83546.tar.gz anaconda-374a06cd523bc57afab8a3532a99258036d83546.tar.xz anaconda-374a06cd523bc57afab8a3532a99258036d83546.zip | |
Backend work
| -rw-r--r-- | backend.py | 7 | ||||
| -rw-r--r-- | dispatch.py | 6 | ||||
| -rw-r--r-- | installclass.py | 2 | ||||
| -rw-r--r-- | yuminstall.py | 3 |
4 files changed, 14 insertions, 4 deletions
diff --git a/backend.py b/backend.py index 91044ab07..932aeed1b 100644 --- a/backend.py +++ b/backend.py @@ -12,9 +12,16 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +import iutil import logging +from syslogd import syslog + +from rhpl.translate import _ + +from flags import flags log = logging.getLogger("anaconda") + class AnacondaBackend: def __init__(self, method): self.method = method diff --git a/dispatch.py b/dispatch.py index 14cca8694..84026d9fc 100644 --- a/dispatch.py +++ b/dispatch.py @@ -103,7 +103,7 @@ installSteps = [ ("timezone", ("id.instLanguage", "id.timezone")), ("accounts", ("intf", "id.rootPassword")), #XXX: factor to backend - ("preselection", doPreSelection, ("backend","intf", "id", "instPath")), + #("preselection", doPreSelection, ("backend","intf", "id", "instPath")), #("desktopchoice", ("intf", "id.instClass", "dispatch", "id.grpset")), #("findpackages", upgradeFindPackages, ("intf", "method", "id", "instPath", "dir")), #("selectlangpackages", selectLanguageSupportGroups, ("id.grpset","id.instLanguage")), @@ -113,7 +113,7 @@ installSteps = [ # "id", "instPath")), #("handlemiscpkgs", handleMiscPackages, ("intf", "id", "dir")), #("fixupconditionals", fixupConditionals, ("id.grpset",)), - ("postselection", doPostSelection, ("backend", "intf", "id", "instPath")), + #("postselection", doPostSelection, ("backend", "intf", "id", "instPath")), #XXX: factor to backend #("checkdeps", checkDependencies, ("dir", "intf", "dispatch", "id", "instPath")), #("dependencies", ("id.grpset", "id.dependencies")), @@ -128,7 +128,9 @@ installSteps = [ "instPath")), ("setuptime", setupTimezone, ("id.timezone", "id.upgrade", "instPath", "dir")), + ("preselection", doPreSelection, ("backend","intf", "id", "instPath")), ("preinstallconfig", doPreInstall, ("backend", "intf", "id", "instPath", "dir")), + ("postselection", doPostSelection, ("backend", "intf", "id", "instPath")), ("installpackages", doInstall, ("backend", "intf", "id", "instPath")), #("postinstallconfig", backend.doPostInstall, ("method", "id", "intf", "instPath")), ("writeconfig", writeConfiguration, ("id", "instPath")), diff --git a/installclass.py b/installclass.py index 9bc5ad31a..f36f4b686 100644 --- a/installclass.py +++ b/installclass.py @@ -142,7 +142,9 @@ class BaseInstallClass: "accounts", "readcomps", "selectlangpackages", + "preselection", "package-selection", + "postselection", "handleX11pkgs", "handlemiscpkgs", "fixupconditionals", diff --git a/yuminstall.py b/yuminstall.py index 0e95c9def..46e42b035 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -21,7 +21,6 @@ import urlgrabber.progress import yum import yum.repos import yum.packages -from syslogd import syslog from backend import AnacondaBackend from constants import * from rhpl.translate import _ @@ -242,7 +241,6 @@ class YumBackend(AnacondaBackend): def doPostSelection(self, intf, id, instPath): - self.initLog(id, instPath) win = intf.waitWindow(_("Dependency Check"), _("Checking dependencies in packages selected for installation...")) @@ -296,6 +294,7 @@ class YumBackend(AnacondaBackend): pass # log.error("Error making directory %s: %s" % (i, msg)) + self.initLog(id, instPath) if flags.setupFilesystems: # setup /etc/rpm/platform for the post-install environment |