summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael E Brown <mebrown@michaels-house.net>2007-10-30 09:37:47 -0500
committerMichael E Brown <mebrown@michaels-house.net>2007-10-30 09:37:47 -0500
commitc3a61e9515caa9736f3c95c85704127223c02e37 (patch)
treee1e80c363fe36edb5cbca27dfbaba449e1eb4644
parent0b8db7d48314edad72a2a73ca8c7157a2ed33e4d (diff)
downloadmock-c3a61e9515caa9736f3c95c85704127223c02e37.tar.gz
mock-c3a61e9515caa9736f3c95c85704127223c02e37.tar.xz
mock-c3a61e9515caa9736f3c95c85704127223c02e37.zip
better defaults for root/yum cache age. remove unused max_age_days from ccache_opts. Exit with non-zero return code on bad command line.
-rwxr-xr-xsrc/mock.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mock.py b/src/mock.py
index 769b543..4afb7ce 100755
--- a/src/mock.py
+++ b/src/mock.py
@@ -125,9 +125,9 @@ def setup_default_config_opts(config_opts):
config_opts['plugin_dir'] = os.path.join(PKGPYTHONDIR, "plugins")
config_opts['plugin_conf'] = {
'ccache_enable': True,
- 'ccache_opts': {'max_age_days': 15, 'max_cache_size': "4G", 'dir': "%(cache_topdir)s/%(root)s/ccache/"},
+ 'ccache_opts': {'max_cache_size': "4G", 'dir': "%(cache_topdir)s/%(root)s/ccache/"},
'yum_cache_enable': True,
- 'yum_cache_opts': {'max_age_days': 15, 'dir': "%(cache_topdir)s/%(root)s/yum_cache/"},
+ 'yum_cache_opts': {'max_age_days': 30, 'dir': "%(cache_topdir)s/%(root)s/yum_cache/"},
'root_cache_enable': True,
'root_cache_opts': {'max_age_days': 15, 'dir': "%(cache_topdir)s/%(root)s/root_cache/"},
'bind_mount_enable': True,
@@ -330,7 +330,7 @@ def main(retParams):
do_rebuild(config_opts, chroot, args[1:])
else:
- log.error("Unknown command specified: %s" % args[0])
+ raise mock.exception.BadCmdline, "Unknown command specified: %s" % args[0]
if __name__ == '__main__':