Revision 3374afa9
| b/lib/backend.py | ||
|---|---|---|
| 1490 | 1490 |
" a regular file" % os_dir) |
| 1491 | 1491 |
|
| 1492 | 1492 |
try: |
| 1493 |
f = open(api_file) |
|
| 1494 |
try: |
|
| 1495 |
api_versions = f.readlines() |
|
| 1496 |
finally: |
|
| 1497 |
f.close() |
|
| 1493 |
api_versions = utils.ReadFile(api_file).splitlines() |
|
| 1498 | 1494 |
except EnvironmentError, err: |
| 1499 | 1495 |
return False, ("Error while reading the API version file at %s: %s" %
|
| 1500 | 1496 |
(api_file, _ErrnoOrStr(err))) |
| b/lib/hypervisor/hv_base.py | ||
|---|---|---|
| 315 | 315 |
|
| 316 | 316 |
""" |
| 317 | 317 |
try: |
| 318 |
fh = file("/proc/meminfo")
|
|
| 319 |
try: |
|
| 320 |
data = fh.readlines() |
|
| 321 |
finally: |
|
| 322 |
fh.close() |
|
| 318 |
data = utils.ReadFile("/proc/meminfo").splitlines()
|
|
| 323 | 319 |
except EnvironmentError, err: |
| 324 | 320 |
raise errors.HypervisorError("Failed to list node info: %s" % (err,))
|
| 325 | 321 |
|
| b/tools/lvmstrap | ||
|---|---|---|
| 44 | 44 |
import optparse |
| 45 | 45 |
import time |
| 46 | 46 |
|
| 47 |
from ganeti.utils import RunCmd |
|
| 47 |
from ganeti.utils import RunCmd, ReadFile
|
|
| 48 | 48 |
from ganeti import constants |
| 49 | 49 |
|
| 50 | 50 |
USAGE = ("\tlvmstrap diskinfo\n"
|
| ... | ... | |
| 424 | 424 |
a mountpoint: device number dictionary |
| 425 | 425 |
""" |
| 426 | 426 |
|
| 427 |
f = open("/proc/mounts", "r")
|
|
| 428 |
mountlines = f.readlines() |
|
| 429 |
f.close() |
|
| 427 |
mountlines = ReadFile("/proc/mounts").splitlines()
|
|
| 430 | 428 |
mounts = {}
|
| 431 | 429 |
for line in mountlines: |
| 432 | 430 |
device, mountpoint, fstype, rest = line.split(None, 3) |
Also available in: Unified diff