diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-02-06 16:54:25 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-02-06 16:54:25 +0000 |
| commit | 6e940104030c6a7fcc92119a600230cabf0b5a88 (patch) | |
| tree | 626918da1ced5a242a56d6d5a5370c0c907ca179 | |
| parent | 3c3e7a9e3e669c81d4b45e75fa147abd34a9358f (diff) | |
| download | anaconda-6e940104030c6a7fcc92119a600230cabf0b5a88.tar.gz anaconda-6e940104030c6a7fcc92119a600230cabf0b5a88.tar.xz anaconda-6e940104030c6a7fcc92119a600230cabf0b5a88.zip | |
handle not being able to merge the hdlist sanely (#83594) and reuse the string
from packages.py to avoid breaking the string freeze :)
| -rw-r--r-- | upgrade.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/upgrade.py b/upgrade.py index 6549109f1..2ad3def2a 100644 --- a/upgrade.py +++ b/upgrade.py @@ -325,7 +325,14 @@ def upgradeFindPackages(intf, method, id, instPath, dir): global rebuildTime if not rebuildTime: rebuildTime = str(int(time.time())) - method.mergeFullHeaders(id.hdList) + try: + method.mergeFullHeaders(id.hdList) + except FileCopyException: + method.unmountCD() + intf.messageWindow(_("Error"), + _("Unable to merge header list. This may be " + "due to a missing file or bad media. " + "Press <return> to try again.")) # if we've been through here once for this root, then short-circuit if ((id.upgradeInfoFound is not None) and |