1.1 --- a/src/encryptionprovider.py Fri Jun 06 11:43:10 2014 +0200
1.2 +++ b/src/encryptionprovider.py Fri Jun 06 11:57:40 2014 +0200
1.3 @@ -133,17 +133,17 @@
1.4 def isDeviceMountedAtMountpoint (device, mountpoint):
1.5 command = ("/bin/df %s | /usr/bin/tail -1 | awk '{print $1}'" %(mountpoint,))
1.6 pipe = os.popen(command)
1.7 - result = pipe.read()
1.8 + result = pipe.read().rstrip()
1.9
1.10 if (pipe.close() != None):
1.11 LOG.error ("error: %s" %(result,))
1.12 exit (1)
1.13
1.14 if (result == device):
1.15 - LOG.debug ("Result: %s" %(result,))
1.16 + LOG.debug ("Device: %s ### Result: %s ### Return: True" %(device, result,))
1.17 return True
1.18 else:
1.19 - LOG.debug ("Result: %s" %(result,))
1.20 + LOG.debug ("Device: %s ### Result: %s ### Return: False" %(device, result,))
1.21 return False
1.22
1.23