Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8916d530
authored
Jan 22, 2015
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: fix random unicode errors
Closes
#377
parent
bd2667df
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
circle/vm/operations.py
+2
-1
No files found.
circle/vm/operations.py
View file @
8916d530
...
@@ -26,7 +26,6 @@ from StringIO import StringIO
...
@@ -26,7 +26,6 @@ from StringIO import StringIO
from
tarfile
import
TarFile
,
TarInfo
from
tarfile
import
TarFile
,
TarInfo
import
time
import
time
from
urlparse
import
urlsplit
from
urlparse
import
urlsplit
from
salt.client
import
LocalClient
from
django.core.exceptions
import
PermissionDenied
,
SuspiciousOperation
from
django.core.exceptions
import
PermissionDenied
,
SuspiciousOperation
from
django.utils
import
timezone
from
django.utils
import
timezone
...
@@ -1203,6 +1202,8 @@ class UpdateNodeOperation(NodeOperation):
...
@@ -1203,6 +1202,8 @@ class UpdateNodeOperation(NodeOperation):
async_queue
=
"localhost.man.slow"
async_queue
=
"localhost.man.slow"
def
minion_cmd
(
self
,
module
,
params
,
timeout
=
3600
):
def
minion_cmd
(
self
,
module
,
params
,
timeout
=
3600
):
# see https://git.ik.bme.hu/circle/cloud/issues/377
from
salt.client
import
LocalClient
name
=
self
.
node
.
host
.
hostname
name
=
self
.
node
.
host
.
hostname
client
=
LocalClient
()
client
=
LocalClient
()
data
=
client
.
cmd
(
data
=
client
.
cmd
(
...
...
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