Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
kamaki
Commits
9b2dba5e
Commit
9b2dba5e
authored
Oct 09, 2013
by
Stavros Sachtouris
Browse files
Merge branch 'hotfix-0.11.1'
parents
9f75385a
8c9eb523
Changes
3
Show whitespace changes
Inline
Side-by-side
Changelog
View file @
9b2dba5e
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:
...
...
kamaki/cli/commands/cyclades.py
View file @
9b2dba5e
...
@@ -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
)
...
...
version
View file @
9b2dba5e
0.11
0.11
.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment