Commit 61031a0b authored by Marco Mariani's avatar Marco Mariani

fixed message, import reorder

parent db3a5a39
...@@ -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"
......
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