summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael E Brown <michael_e_brown@dell.com>2007-10-15 23:41:04 -0500
committerMichael E Brown <michael_e_brown@dell.com>2007-10-15 23:41:04 -0500
commit8e1f7700c1ed4f7ae91c7cd18888c446d1c84021 (patch)
treea8b1bb9e9ee0c91c79f01c64736ed4b296048ebc
parent628010b1a35d72d971e97e841347443698f1caa8 (diff)
downloadmock-8e1f7700c1ed4f7ae91c7cd18888c446d1c84021.tar.gz
mock-8e1f7700c1ed4f7ae91c7cd18888c446d1c84021.tar.xz
mock-8e1f7700c1ed4f7ae91c7cd18888c446d1c84021.zip
add/install logging config file.
-rw-r--r--Makefile.am6
-rw-r--r--Makefile.in6
-rw-r--r--etc/logging.ini23
3 files changed, 29 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 824fe1d..5c21de5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,15 +42,15 @@ src_mock_SOURCES = src/mock.c
src_mock_LDFLAGS =
mocketcdir = $(sysconfdir)/mock
-dist_mocketc_DATA = $(wildcard etc/*.cfg)
+dist_mocketc_DATA = $(wildcard etc/*.cfg) etc/logging.ini
EXTRA_DIST += docs buildsys-build.spec
dist_libexec_SCRIPTS = src/mock.py
man_MANS = docs/mock.1
-pkgpython_PYTHON = src/util.py src/__init__.py
+pkgpython_PYTHON = src/mock/util.py src/mock/__init__.py src/mock/backend.py
-src/mock.py: configure.ac Makefile.am
+src/mock.py: configure.ac Makefile.am src/mock.py
echo Updating $@, current pwd: $$(pwd)
cp -f $(top_srcdir)/$@ $(top_builddir)/$@.new
perl -p -i -e 's|^__VERSION__=.*|__VERSION__="$(RELEASE_VERSION)"|' $(top_builddir)/$@.new
diff --git a/Makefile.in b/Makefile.in
index d36b35c..9969d5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -272,10 +272,10 @@ src_libselinux_mock_la_SOURCES = src/selinux-mock.c
src_mock_SOURCES = src/mock.c
src_mock_LDFLAGS =
mocketcdir = $(sysconfdir)/mock
-dist_mocketc_DATA = $(wildcard etc/*.cfg)
+dist_mocketc_DATA = $(wildcard etc/*.cfg) etc/logging.ini
dist_libexec_SCRIPTS = src/mock.py
man_MANS = docs/mock.1
-pkgpython_PYTHON = src/util.py src/__init__.py
+pkgpython_PYTHON = src/mock/util.py src/mock/__init__.py src/mock/backend.py
all: all-recursive
.SUFFIXES:
@@ -967,7 +967,7 @@ uninstall-man: uninstall-man1
$(bin_PROGRAMS): src/libselinux-mock.la
$(EXTRA_PROGRAMS): src/libselinux-mock.la
-src/mock.py: configure.ac Makefile.am
+src/mock.py: configure.ac Makefile.am src/mock.py
echo Updating $@, current pwd: $$(pwd)
cp -f $(top_srcdir)/$@ $(top_builddir)/$@.new
perl -p -i -e 's|^__VERSION__=.*|__VERSION__="$(RELEASE_VERSION)"|' $(top_builddir)/$@.new
diff --git a/etc/logging.ini b/etc/logging.ini
new file mode 100644
index 0000000..0681797
--- /dev/null
+++ b/etc/logging.ini
@@ -0,0 +1,23 @@
+[formatters]
+keys: detailed,simple
+
+[handlers]
+keys: console
+
+[loggers]
+keys: main
+
+[formatter_simple]
+format: %(name)s:%(levelname)s: %(message)s
+
+[formatter_detailed]
+format: %(name)s:%(levelname)s %(module)s:%(lineno)d: %(message)s
+
+[handler_console]
+class: StreamHandler
+args: []
+formatter: simple
+
+[logger_main]
+level: DEBUG
+handlers: console