From 3eaddeb432b8755345f50acaf370be9146eb551e Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Tue, 18 Nov 2008 17:29:02 -0600 Subject: add new exception for result dir not being accessible and print nice friendly error message. --- py/mock.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'py/mock.py') diff --git a/py/mock.py b/py/mock.py index d04c859..f2e413a 100755 --- a/py/mock.py +++ b/py/mock.py @@ -652,6 +652,11 @@ if __name__ == '__main__': exitStatus = 7 log.error("Exiting on user interrupt, -C") + except (mock.exception.ResultDirNotAccessible,), exc: + exitStatus = exc.resultcode + log.error(str(exc)) + killOrphans = 0 + except (mock.exception.BadCmdline, mock.exception.BuildRootLocked), exc: exitStatus = exc.resultcode log.error(str(exc)) -- cgit From d0bbbdb28ab908e95437e7a2ca5b68cdb5634030 Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Fri, 19 Dec 2008 15:57:19 -0600 Subject: added version key to config options; moved cache_topdir to /var/cache/mock; removed trailing slash from basedir --- py/mock.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'py/mock.py') diff --git a/py/mock.py b/py/mock.py index d04c859..f528efa 100755 --- a/py/mock.py +++ b/py/mock.py @@ -191,9 +191,10 @@ decorate(traceLog()) def setup_default_config_opts(config_opts, unprivUid): "sets up default configuration." # global - config_opts['basedir'] = '/var/lib/mock/' # root name is automatically added to this + config_opts['version'] = __VERSION__ + config_opts['basedir'] = '/var/lib/mock' # root name is automatically added to this config_opts['resultdir'] = '%(basedir)s/%(root)s/result' - config_opts['cache_topdir'] = '/var/lib/mock/cache' + config_opts['cache_topdir'] = '/var/cache/mock' config_opts['clean'] = True config_opts['chroothome'] = '/builddir' config_opts['log_config_file'] = 'logging.ini' -- cgit