summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-10-07 21:49:45 +0000
committerJeremy Katz <katzj@redhat.com>2002-10-07 21:49:45 +0000
commitcfda696bbc8df635aaae7eae53b4b056e4e3fab6 (patch)
treeb9a029e3606b75dd55601ffc64df5df4e7688933
parentc5a0a9b8a716679ed9aca0870eb23790dec4e329 (diff)
downloadanaconda-cfda696bbc8df635aaae7eae53b4b056e4e3fab6.tar.gz
anaconda-cfda696bbc8df635aaae7eae53b4b056e4e3fab6.tar.xz
anaconda-cfda696bbc8df635aaae7eae53b4b056e4e3fab6.zip
use R_OK instead of O_RDONLY for access calls. granted, it doesn't really
matter for us because the file's existence means we can read it (we're running as root) and O_RDONLY = 0 and F_OK = 0, but while I'm fixing things in here, I might as well be thorough
-rw-r--r--image.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/image.py b/image.py
index 0260048b0..b233ea85b 100644
--- a/image.py
+++ b/image.py
@@ -159,7 +159,7 @@ class CdromInstallMethod(ImageInstallMethod):
try:
if not isys.mount(dev, "/mnt/source", fstype = "iso9660",
readOnly = 1):
- if os.access("/mnt/source/.discinfo", os.O_RDONLY):
+ if os.access("/mnt/source/.discinfo", os.R_OK):
f = open("/mnt/source/.discinfo")
newStamp = f.readline().strip()
try:
@@ -204,7 +204,7 @@ class CdromInstallMethod(ImageInstallMethod):
fstype = "iso9660", readOnly = 1)
- if os.access("/mnt/source/.discinfo", os.O_RDONLY):
+ if os.access("/mnt/source/.discinfo", os.R_OK):
f = open("/mnt/source/.discinfo")
newStamp = f.readline().strip()
try:
@@ -294,7 +294,7 @@ class CdromInstallMethod(ImageInstallMethod):
# figure out which disc is in. if we fail for any reason,
# assume it's just disc1.
- if os.access("/mnt/source/.discinfo", os.O_RDONLY):
+ if os.access("/mnt/source/.discinfo", os.R_OK):
try:
f = open("/mnt/source/.discinfo")
self.timestamp = f.readline().strip()