X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=plugins%2Frawdisk.py;h=616d2c605ea1e84d7f407b47717c154e6f025423;hp=f64affec3f8b2ee619993b94750abd9fa2c65778;hb=1b4f53e648b13f7629970787b6ec03387e2d966a;hpb=9e596e6eb3c871ab25837903b0ed30f165d9d688 diff --git a/plugins/rawdisk.py b/plugins/rawdisk.py index f64affe..616d2c6 100644 --- a/plugins/rawdisk.py +++ b/plugins/rawdisk.py @@ -33,19 +33,19 @@ def get_unused_devices(): in_vg.extend(map(lambda x: x.replace("!", "/"), os.listdir("/sys/block/%s/slaves" % i))) # Read the list of partitions - partitions = file("/proc/partitions", "r") - pat = re.compile("\s+") - while True: - buf = partitions.readline() - if buf == "": - break - buf = buf.strip() - fields = re.split(pat, buf) - dev = fields[-1] - if (not dev.startswith("dm-") and dev not in in_vg and - os.path.exists("/dev/%s" % dev) and - (os.minor(os.stat("/dev/%s" % dev).st_rdev) % 2) != 0): - devices.append("/dev/%s" % dev) + with open("/proc/partitions") as partitions: + pat = re.compile("\s+") + while True: + buf = partitions.readline() + if buf == "": + break + buf = buf.strip() + fields = re.split(pat, buf) + dev = fields[-1] + if (not dev.startswith("dm-") and dev not in in_vg and + os.path.exists("/dev/%s" % dev) and + (os.minor(os.stat("/dev/%s" % dev).st_rdev) % 2) != 0): + devices.append("/dev/%s" % dev) partitions.close() return devices