Commit 9b2dba5e authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Merge branch 'hotfix-0.11.1'

parents 9f75385a 8c9eb523
CHANGELOG for hotfix 0.11.1
Bug fixes:
- Check if personlity mode is always in octal
CHANGELOG for version 0.11 CHANGELOG for version 0.11
Bug Fixes: Bug Fixes:
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
# or implied, of GRNET S.A. # or implied, of GRNET S.A.
from base64 import b64encode from base64 import b64encode
from os.path import exists from os.path import exists, expanduser
from io import StringIO from io import StringIO
from pydoc import pager from pydoc import pager
...@@ -67,7 +67,7 @@ howto_personality = [ ...@@ -67,7 +67,7 @@ howto_personality = [
' [server-path=]SERVER_PATH: destination location inside server Image', ' [server-path=]SERVER_PATH: destination location inside server Image',
' [owner=]OWNER: virtual servers user id for the remote file', ' [owner=]OWNER: virtual servers user id for the remote file',
' [group=]GROUP: virtual servers group id or name for the remote file', ' [group=]GROUP: virtual servers group id or name for the remote file',
' [mode=]MODE: permission in octal (e.g., 0777 or o+rwx)', ' [mode=]MODE: permission in octal (e.g., 0777)',
'e.g., -p /tmp/my.file,owner=root,mode=0777'] 'e.g., -p /tmp/my.file,owner=root,mode=0777']
...@@ -351,7 +351,7 @@ class PersonalityArgument(KeyValueArgument): ...@@ -351,7 +351,7 @@ class PersonalityArgument(KeyValueArgument):
details=howto_personality) details=howto_personality)
self._value.append(dict(path=path)) self._value.append(dict(path=path))
with open(path) as f: with open(expanduser(path)) as f:
self._value[i]['contents'] = b64encode(f.read()) self._value[i]['contents'] = b64encode(f.read())
for k, v in self.terms[1:]: for k, v in self.terms[1:]:
try: try:
...@@ -361,6 +361,13 @@ class PersonalityArgument(KeyValueArgument): ...@@ -361,6 +361,13 @@ class PersonalityArgument(KeyValueArgument):
self._value[i][v] = termlist.pop(0) self._value[i][v] = termlist.pop(0)
except IndexError: except IndexError:
continue continue
if k in ('mode', ) and self._value[i][v]:
try:
self._value[i][v] = int(self._value[i][v], 8)
except ValueError as ve:
raise CLIInvalidArgument(
'Personality mode must be in octal', details=[
'%s' % ve])
@command(server_cmds) @command(server_cmds)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment