andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup logger stuff, remove more path stuff from cdist bin

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-26 10:28:57 +02:00
commit e6a903fd96
3 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/cdist
View file

@ -48,16 +48,6 @@ BANNER = """
"P' "" "" "P' "" ""
""" """
# Given paths from installation
REMOTE_BASE_DIR = "/var/lib/cdist"
REMOTE_CONF_DIR = os.path.join(REMOTE_BASE_DIR, "conf")
REMOTE_OBJECT_DIR = os.path.join(REMOTE_BASE_DIR, "object")
REMOTE_TYPE_DIR = os.path.join(REMOTE_CONF_DIR, "type")
REMOTE_GLOBAL_EXPLORER_DIR = os.path.join(REMOTE_CONF_DIR, "explorer")
CODE_HEADER = "#!/bin/sh -e\n"
DOT_CDIST = ".cdist"
TYPE_PREFIX = "__"
VERSION = "2.0.1" VERSION = "2.0.1"
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s') logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')

4
lib/cdist/exec.py
View file

@ -22,9 +22,7 @@
import logging import logging
import subprocess import subprocess
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s') log = logging.getLogger(__name__)
log = logging.getLogger()
def shell_run_or_debug_fail(script, *args, **kargs): def shell_run_or_debug_fail(script, *args, **kargs):
# Manually execute /bin/sh, because sh -e does what we want # Manually execute /bin/sh, because sh -e does what we want

3
lib/cdist/path.py
View file

@ -35,8 +35,7 @@ CODE_HEADER = "#!/bin/sh -e\n"
DOT_CDIST = ".cdist" DOT_CDIST = ".cdist"
TYPE_PREFIX = "__" TYPE_PREFIX = "__"
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s') log = logging.getLogger(__name__)
log = logging.getLogger()
import cdist.exec import cdist.exec