summaryrefslogtreecommitdiffstats
path: root/partedUtils.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-03-29 16:56:48 +0000
committerJeremy Katz <katzj@redhat.com>2005-03-29 16:56:48 +0000
commitf9120fd1cda065689264b80bf8bb239f0f656528 (patch)
tree9a49713b0d80675c7df345adb879abfaadcc72b5 /partedUtils.py
parentf42bd73758acead907996db493b145aff8f3b294 (diff)
downloadanaconda-f9120fd1cda065689264b80bf8bb239f0f656528.tar.gz
anaconda-f9120fd1cda065689264b80bf8bb239f0f656528.tar.xz
anaconda-f9120fd1cda065689264b80bf8bb239f0f656528.zip
2005-03-29 Jeremy Katz <katzj@redhat.com>
* partedUtils.py (getRedHatReleaseString): Change to getReleaseString. * upgrade.py (findExistingRoots): Method name change.
Diffstat (limited to 'partedUtils.py')
-rw-r--r--partedUtils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/partedUtils.py b/partedUtils.py
index b637da08f..697aee90e 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -456,7 +456,7 @@ def sniffFilesystemType(device):
return None
-def getRedHatReleaseString(mountpoint):
+def getReleaseString(mountpoint):
if os.access(mountpoint + "/etc/redhat-release", os.R_OK):
f = open(mountpoint + "/etc/redhat-release", "r")
try:
@@ -602,7 +602,7 @@ class DiskSet:
if found:
if os.access (mountpoint + '/etc/fstab', os.R_OK):
- relstr = getRedHatReleaseString(mountpoint)
+ relstr = getReleaseString(mountpoint)
cmdline = open('/proc/cmdline', 'r').read()
if ((cmdline.find("upgradeany") != -1) or
@@ -630,7 +630,7 @@ class DiskSet:
if found:
if os.access (mountpoint + '/etc/fstab', os.R_OK):
- relstr = getRedHatReleaseString(mountpoint)
+ relstr = getReleaseString(mountpoint)
cmdline = open('/proc/cmdline', 'r').read()
if ((cmdline.find("upgradeany") != -1) or
@@ -667,7 +667,7 @@ class DiskSet:
part = disk.next_partition(part)
continue
if os.access (mountpoint + '/etc/fstab', os.R_OK):
- relstr = getRedHatReleaseString(mountpoint)
+ relstr = getReleaseString(mountpoint)
cmdline = open('/proc/cmdline', 'r').read()
if ((cmdline.find("upgradeany") != -1) or