diff options
author | Chris Lumens <clumens@redhat.com> | 2012-11-14 14:04:46 -0500 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2012-11-14 16:09:34 -0500 |
commit | 6fa891ab982c8bc85b018431e38c99e5424f7ad8 (patch) | |
tree | 1f6106f2bc43323b103c9ba6155b6f678e3f4401 /pyanaconda/packaging | |
parent | 838808becb08cf0cda1766b4ad5d8f6cd046b98e (diff) | |
download | anaconda-6fa891ab982c8bc85b018431e38c99e5424f7ad8.tar.gz anaconda-6fa891ab982c8bc85b018431e38c99e5424f7ad8.tar.xz anaconda-6fa891ab982c8bc85b018431e38c99e5424f7ad8.zip |
Handle package dependency errors on kickstart installs too (#865073).
This is not handled by similar code in the software spoke, because that code
is never run for kickstart installs containing a %packages section.
Diffstat (limited to 'pyanaconda/packaging')
-rw-r--r-- | pyanaconda/packaging/yumpayload.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 3ce12f709..13c1ba637 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -1234,7 +1234,17 @@ reposdir=%s self._setUpMedia(self.install_device) self._writeInstallConfig() - self.checkSoftwareSelection() + + # We have this block twice. For kickstart installs, this is the only + # place dependencies will be checked. If a dependency error is hit + # here, there's nothing the user can do about it since you cannot go + # back to the first hub. + try: + self.checkSoftwareSelection() + except DependencyError as e: + if errorHandler.cb(e) == ERROR_RAISE: + progress.send_quit(1) + sys.exit(1) # doPreInstall # create mountpoints for protected device mountpoints (?) |