1
0
mirror of https://github.com/gryf/pygtktalog.git synced 2025-12-17 19:40:21 +01:00

* Change of behaviour of eject and umount functions.

This commit is contained in:
2006-12-01 21:53:49 +00:00
parent a8953f2dea
commit fa9984f188

View File

@@ -45,13 +45,15 @@ def volumount(mntp):
if dev != None: if dev != None:
_in,_out,_err = popen2.popen3("umount %s" % dev) _in,_out,_err = popen2.popen3("umount %s" % dev)
inf = _err.readlines() inf = _err.readlines()
for i in inf: error = ''
i.strip() for error in inf:
if check_mount(dev): error.strip()
return 'ok'
if error.strip()[:7] == 'umount:':
return error.strip()
else: else:
return i.strip() return 'ok'
return "Mount point does'nt exist in fstab" return "Cannot umount device"
def check_mount(dev): def check_mount(dev):
"""Refresh the entries from fstab or mount.""" """Refresh the entries from fstab or mount."""
@@ -78,6 +80,16 @@ def mountpoint_to_dev(mntp):
return None return None
def eject_cd(): def eject_cd():
"""mount device, return True/False"""
if len(c.confd['ejectapp']) > 0: if len(c.confd['ejectapp']) > 0:
os.popen("%s %s" %(c.confd['ejectapp'],c.confd['cd'])) _in,_out,_err = popen2.popen3("%s %s" %(c.confd['ejectapp'],c.confd['cd']))
inf = _err.readlines()
error = ''
for error in inf:
error.strip()
if error.strip()[:6] == 'eject:':
return error.strip()
else:
return 'ok'
return "Mount point does'nt exist in fstab"