diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-08-15 18:26:29 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-08-15 18:26:29 +0000 |
| commit | bd294b38146c642f0976b7b7542ef4c73ce4a905 (patch) | |
| tree | 086b5a479f424622ee40ecb7435f87838796e4de | |
| parent | 5fbe021f7afb9ca396046459f6ab180ac6d58920 (diff) | |
| download | anaconda-bd294b38146c642f0976b7b7542ef4c73ce4a905.tar.gz anaconda-bd294b38146c642f0976b7b7542ef4c73ce4a905.tar.xz anaconda-bd294b38146c642f0976b7b7542ef4c73ce4a905.zip | |
2005-08-15 Jeremy Katz <katzj@redhat.com>
* kickstart.py (Kickstart.readKickstart): Remove obsolete and dead
--ignoredeps stuff (#165224).
* instdata.py (InstallData.writePackagesKS): Likewise.
* packages.py (checkDependencies): Likewise.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | instdata.py | 9 | ||||
| -rw-r--r-- | kickstart.py | 4 | ||||
| -rw-r--r-- | packages.py | 18 |
4 files changed, 9 insertions, 29 deletions
@@ -1,3 +1,10 @@ +2005-08-15 Jeremy Katz <katzj@redhat.com> + + * kickstart.py (Kickstart.readKickstart): Remove obsolete and dead + --ignoredeps stuff (#165224). + * instdata.py (InstallData.writePackagesKS): Likewise. + * packages.py (checkDependencies): Likewise. + 2005-08-15 Chris Lumens <clumens@redhat.com> * anaconda_log.py (AnacondaLog.__init__): Keep a log on tty3. diff --git a/instdata.py b/instdata.py index 65a8da46c..d6cf1affb 100644 --- a/instdata.py +++ b/instdata.py @@ -64,7 +64,6 @@ class InstallData: self.partitions = partitions.Partitions() self.bootloader = bootloader.getBootloader() self.dependencies = [] - self.handleDeps = CHECK_DEPS self.dbpath = None self.upgradeRoot = None self.rootParts = None @@ -183,13 +182,7 @@ class InstallData: os.chmod(filename, 0600) def writePackagesKS(self, f): - f.write("\n%packages") - if self.handleDeps == IGNORE_DEPS: - f.write(" --ignoredeps\n") - elif self.handleDeps == RESOLVE_DEPS: - f.write(" --resolvedeps\n") - else: - f.write("\n") + f.write("\n%packages\n") packages = {} forcedoff = {} forcedon = {} diff --git a/kickstart.py b/kickstart.py index f315852df..8a2dd7cdc 100644 --- a/kickstart.py +++ b/kickstart.py @@ -777,10 +777,6 @@ class Kickstart(BaseInstallClass): if len(args) > 1: for arg in args[1:]: - if arg == "--resolvedeps": - id.handleDeps = RESOLVE_DEPS - elif arg == "--ignoredeps": - id.handleDeps = IGNORE_DEPS elif arg == "--excludedocs": id.excludeDocs = 1 elif arg == "--ignoremissing": diff --git a/packages.py b/packages.py index 848ea17ec..25ec7520d 100644 --- a/packages.py +++ b/packages.py @@ -334,27 +334,11 @@ def checkDependencies(dir, intf, disp, id, instPath): id.dependencies = ts.check(depcheck.callback) win.pop() - - if depcheck.added and id.handleDeps == CHECK_DEPS: - disp.skipStep("dependencies", skip = 0) - log.info("had unresolved dependencies, resolved.") - disp.skipStep("dependencies") - else: - disp.skipStep("dependencies") + disp.skipStep("dependencies") f.close() return - # FIXME: I BROKE IT - # this is kind of hackish, but makes kickstart happy - if id.handleDeps == CHECK_DEPS: - pass - elif id.handleDeps == IGNORE_DEPS: - id.comps.selectDepCause(id.dependencies) - id.comps.unselectDeps(id.dependencies) - elif id.handleDeps == RESOLVE_DEPS: - id.comps.selectDepCause(id.dependencies) - id.comps.selectDeps(id.dependencies) class InstallCallback: def packageDownloadCB(self, state, amount): |