Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
slapos.core
Commits
61031a0b
Commit
61031a0b
authored
Jan 30, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed message, import reorder
parent
db3a5a39
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
slapos/format.py
slapos/format.py
+5
-5
No files found.
slapos/format.py
View file @
61031a0b
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
from
optparse
import
OptionParser
,
Option
from
optparse
import
OptionParser
,
Option
from
xml_marshaller
import
xml_marshaller
from
xml_marshaller
import
xml_marshaller
import
ConfigParser
import
ConfigParser
import
errno
import
fcntl
import
grp
import
grp
import
logging
import
logging
import
netaddr
import
netaddr
...
@@ -39,8 +41,10 @@ import pwd
...
@@ -39,8 +41,10 @@ import pwd
import
random
import
random
import
slapos.slap
as
slap
import
slapos.slap
as
slap
import
socket
import
socket
import
struct
import
subprocess
import
subprocess
import
sys
import
sys
import
threading
import
time
import
time
class
OS
(
object
):
class
OS
(
object
):
...
@@ -107,7 +111,7 @@ def callAndRead(argument_list, raise_on_error=True):
...
@@ -107,7 +111,7 @@ def callAndRead(argument_list, raise_on_error=True):
stderr
=
subprocess
.
STDOUT
)
stderr
=
subprocess
.
STDOUT
)
result
=
popen
.
communicate
()[
0
]
result
=
popen
.
communicate
()[
0
]
if
raise_on_error
and
popen
.
returncode
!=
0
:
if
raise_on_error
and
popen
.
returncode
!=
0
:
raise
ValueError
(
'Issue
during
invoking %r, result was:
\
n
%s'
%
(
raise
ValueError
(
'Issue
while
invoking %r, result was:
\
n
%s'
%
(
argument_list
,
result
))
argument_list
,
result
))
return
popen
.
returncode
,
result
return
popen
.
returncode
,
result
...
@@ -494,10 +498,6 @@ class User(object):
...
@@ -494,10 +498,6 @@ class User(object):
except
KeyError
:
except
KeyError
:
return
False
return
False
import
struct
import
fcntl
import
errno
import
threading
class
Tap
(
object
):
class
Tap
(
object
):
"Tap represent a tap interface on the system"
"Tap represent a tap interface on the system"
...
...
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