Merge ssh://mock/~/git/mock

* ssh://mock/~/git/mock:
  better error message for when logging.ini doesnt exist. version bump.
  version bump

3 files changed, 20 insertions, 15 deletions

diff --git a/configure b/configure
index 894f767..b7de66c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mock 0.8.4.
+# Generated by GNU Autoconf 2.61 for mock 0.8.5.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mock'
 PACKAGE_TARNAME='mock'
-PACKAGE_VERSION='0.8.4'
-PACKAGE_STRING='mock 0.8.4'
+PACKAGE_VERSION='0.8.5'
+PACKAGE_STRING='mock 0.8.5'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mock 0.8.4 to adapt to many kinds of systems.
+\`configure' configures mock 0.8.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mock 0.8.4:";;
+     short | recursive ) echo "Configuration of mock 0.8.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mock configure 0.8.4
+mock configure 0.8.5
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1592,7 +1592,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mock $as_me 0.8.4, which was
+It was created by mock $as_me 0.8.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1949,7 +1949,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 temp_RELEASE_NAME=mock
 temp_RELEASE_MAJOR=0
 temp_RELEASE_MINOR=8
-temp_RELEASE_SUBLEVEL=4
+temp_RELEASE_SUBLEVEL=5
 temp_RELEASE_EXTRALEVEL=
 ####################################
 
@@ -2291,7 +2291,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mock'
- VERSION='0.8.4'
+ VERSION='0.8.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22581,7 +22581,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mock $as_me 0.8.4, which was
+This file was extended by mock $as_me 0.8.5, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22634,7 +22634,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mock config.status 0.8.4
+mock config.status 0.8.5
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 4133d5a..a27a2a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,12 +4,12 @@
 
 ####################################
 # change version here.
-AC_INIT([mock],[0.8.4])
+AC_INIT([mock],[0.8.5])
 
 temp_RELEASE_NAME=mock
 temp_RELEASE_MAJOR=0
 temp_RELEASE_MINOR=8
-temp_RELEASE_SUBLEVEL=4
+temp_RELEASE_SUBLEVEL=5
 temp_RELEASE_EXTRALEVEL=
 ####################################
 
diff --git a/src/mock.py b/src/mock.py
index cca136a..cca353e 100755
--- a/src/mock.py
+++ b/src/mock.py
@@ -30,7 +30,7 @@ import time
 from optparse import OptionParser
 
 # all of the variables below are substituted by the build system
-__VERSION__="0.8.4"
+__VERSION__="0.8.5"
 SYSCONFDIR="/usr/local/etc"
 PYTHONDIR="/usr/local/lib/python2.5/site-packages"
 PKGPYTHONDIR="/usr/local/lib/python2.5/site-packages/mock"
@@ -237,7 +237,12 @@ def main(retParams):
         config_path = options.configdir
 
     # basic config for logging until config files are read
-    logging.config.fileConfig(os.path.join(config_path, config_opts["log_config_file"]))
+    log_ini = os.path.join(config_path, config_opts["log_config_file"])
+    try:
+        logging.config.fileConfig(log_ini)
+    except (IOError, OSError), e:
+        log.error("Could not find required logging config file: %s" % log_ini)
+        sys.exit(50)
 
     # check args
     if len(args) < 1: