From 4cfe2a32c001c5280fd7f09f95012ce6938cc43a Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Thu, 30 Oct 2014 15:55:13 +0100 Subject: [PATCH] Fix a few things introduced by the rebase --- .../patches/debian/config/opt/cloud/bin/configure.py | 10 ---------- .../patches/debian/config/opt/cloud/bin/cs/CsRule.py | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/config/opt/cloud/bin/configure.py index e86bb197579..6d3a0887b28 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/configure.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/configure.py @@ -27,16 +27,6 @@ import re import time import shutil import os.path -import CsHelper - -from CsNetfilter import CsNetfilters -from fcntl import flock, LOCK_EX, LOCK_UN -from CsDhcp import CsDhcp -from CsRedundant import * -from CsFile import CsFile -from CsAddress import CsAddress, CsInterface, CsDevice, CsIP -from CsApp import CsApache, CsPasswdSvc, CsDnsmasq -from CsRoute import CsRoute from fcntl import flock, LOCK_EX, LOCK_UN from cs.CsDatabag import CsDataBag, CsCmdLine diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py index 637074b388a..fe9d708adad 100644 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py @@ -16,6 +16,7 @@ # specific language governing permissions and limitations # under the License. import CsHelper +import logging class CsRule: """ Manage iprules