diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-02-11 07:36:17 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-02-11 07:36:17 +0000 |
| commit | 16266325d54b320d6581717ec333237ce78ec5e3 (patch) | |
| tree | 22e4860d9d413d25633546c7ad58ab396e1d17e3 | |
| parent | d21f6afb8915525deeeb0a062c480113ed9e959e (diff) | |
| download | anaconda-16266325d54b320d6581717ec333237ce78ec5e3.tar.gz anaconda-16266325d54b320d6581717ec333237ce78ec5e3.tar.xz anaconda-16266325d54b320d6581717ec333237ce78ec5e3.zip | |
check that files exist before we read header lists. this is getting
annoying :) (#84016)
| -rw-r--r-- | harddrive.py | 14 | ||||
| -rw-r--r-- | image.py | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/harddrive.py b/harddrive.py index 4624ea4ad..bd2083c2d 100644 --- a/harddrive.py +++ b/harddrive.py @@ -13,7 +13,7 @@ from comps import ComponentSet, HeaderList, HeaderListFromFile -from installmethod import InstallMethod +from installmethod import InstallMethod, FileCopyException from image import findIsoImages import shutil import os @@ -79,12 +79,18 @@ class OldHardDriveInstallMethod(InstallMethod): def readHeaders(self): self.mountMedia() + if not os.access(self.tree + "/RedHat/base/hdlist", os.R_OK): + self.umountMedia() + raise FileCopyException hl = HeaderListFromFile(self.tree + self.path + "/RedHat/base/hdlist") self.umountMedia() return hl def mergeFullHeaders(self, hdlist): self.mountMedia() + if not os.access(self.tree + "/RedHat/base/hdlist2", os.R_OK): + self.umountMedia() + raise FileCopyException hdlist.mergeFullHeaders(self.tree + self.path + "/RedHat/base/hdlist2") self.umountMedia() @@ -198,6 +204,9 @@ class HardDriveInstallMethod(InstallMethod): def readHeaders(self): self.mountMedia(1) + if not os.access(self.tree + "/RedHat/base/hdlist", os.R_OK): + self.umountMedia() + raise FileCopyException hl = HeaderListFromFile(self.tree + "/RedHat/base/hdlist") self.umountMedia() @@ -214,6 +223,9 @@ class HardDriveInstallMethod(InstallMethod): def mergeFullHeaders(self, hdlist): self.mountMedia(1) + if not os.access(self.tree + "/RedHat/base/hdlist", os.R_OK): + self.umountMedia() + raise FileCopyException hdlist.mergeFullHeaders(self.tree + "/RedHat/base/hdlist2") self.umountMedia() @@ -40,9 +40,13 @@ class ImageInstallMethod(InstallMethod): return self.tree + "/RedHat/RPMS/" + h[1000000] def readHeaders(self): + if not os.access(self.tree + "/RedHat/base/hdlist", os.R_OK): + raise FileCopyException return HeaderListFromFile(self.tree + "/RedHat/base/hdlist") def mergeFullHeaders(self, hdlist): + if not os.access(self.tree + "/RedHat/base/hdlist2", os.R_OK): + raise FileCopyException hdlist.mergeFullHeaders(self.tree + "/RedHat/base/hdlist2") def getSourcePath(self): |