diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-03-29 16:56:48 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-03-29 16:56:48 +0000 |
| commit | f9120fd1cda065689264b80bf8bb239f0f656528 (patch) | |
| tree | 9a49713b0d80675c7df345adb879abfaadcc72b5 | |
| parent | f42bd73758acead907996db493b145aff8f3b294 (diff) | |
| download | anaconda-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.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | partedUtils.py | 8 | ||||
| -rw-r--r-- | upgrade.py | 2 |
3 files changed, 8 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2005-03-29 Jeremy Katz <katzj@redhat.com> + * partedUtils.py (getRedHatReleaseString): Change to getReleaseString. + * upgrade.py (findExistingRoots): Method name change. + * constants.py: Make bugzilla URL more changeable. * iw/xconfig_gui.py (XConfigWindow.getNext): Likewise. * packages.py (betaNagScreen): Likewise. 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 diff --git a/upgrade.py b/upgrade.py index 2da06a6ba..ba121222d 100644 --- a/upgrade.py +++ b/upgrade.py @@ -57,7 +57,7 @@ def findRootParts(intf, id, dispatch, dir, chroot): def findExistingRoots(intf, id, chroot, upgradeany = 0): if not flags.setupFilesystems: - relstr = partedUtils.getRedHatReleaseString (chroot) + relstr = partedUtils.getReleaseString (chroot) if ((cmdline.find("upgradeany") != -1) or (upgradeany == 1) or (partedUtils.productMatches(relstr, productName))): |