mock mock.py,1.45,1.46

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv456

Modified Files:
	mock.py 
Log Message:
check in global defaults patch from  Andreas Thienemann




Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mock.py	12 May 2006 20:57:03 -0000	1.45
+++ mock.py	14 May 2006 04:48:11 -0000	1.46
@@ -735,6 +735,14 @@
     if options.configdir:
         config_path = options.configdir
     
+    # Read in the default values which can be overwritten
+    # with the more specific config being loaded below.
+    cfg = os.path.join(config_path, 'defaults.cfg')
+    if os.path.exists(cfg):
+        execfile(cfg)
+    else:
+        pass # not finding the defaults.cfg file is no error
+    
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)