mock ChangeLog,1.2,1.3 mock.py,1.10,1.11

[Seth Vidal (skvidal)]

Author: skvidal

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

Modified Files:
	ChangeLog mock.py 
Log Message:

--statedir on cli
write out some of config into resultdir in a file named mockconfig.log



Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	28 May 2005 17:24:49 -0000	1.2
+++ ChangeLog	21 Jun 2005 13:47:33 -0000	1.3
@@ -1,3 +1,37 @@
+2005-06-11 23:56  skvidal
+
+	* mock.py: 
+	label 0.3
+
+2005-06-11 23:38  skvidal
+
+	* mock.spec, src/mock-helper.c: 
+	security fix - pointed out by Toshio Kuratomi
+
+2005-06-05 10:51  skvidal
+
+	* mock.spec: 
+	changes to spec file for fedora extras
+
+2005-06-05 04:03  skvidal
+
+	* mock.spec: few more fixes
+
+2005-06-05 04:00  skvidal
+
+	* mock.spec: 
+	clean up spec file for fedora extras
+
+2005-05-28 13:25  skvidal
+
+	* Makefile: 
+	change make clean in . of dist dir
+
+2005-05-28 13:24  skvidal
+
+	* ChangeLog: 
+	update changelog
+
 2005-05-28 13:24  skvidal
 
 	* mock.spec: 


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.py	16 Jun 2005 20:07:51 -0000	1.10
+++ mock.py	21 Jun 2005 13:47:33 -0000	1.11
@@ -71,6 +71,15 @@
         build_log = os.path.join(self.resultdir, 'build.log')
         self._build_log = open(build_log, 'w+')
         
+        # write out the config file
+        cfg_log = os.path.join(self.resultdir, 'mockconfig.log')
+        cfgout = open(cfg_log, 'w+')
+        cfgout.write('rootdir = %s' % self.rootdir)
+        cfgout.write('resultdir = %s' % self.resultdir)
+        cfgout.write('statedir = %s' % self.statedir)
+        cfgout.close()
+
+        
     
     def build_log(self, content):
         if type(content) is types.ListType:
@@ -567,8 +576,10 @@
              default=None, help="target build arch")
     parser.add_option("--debug", action ="store_true", dest="debug", 
              default=False, help="Output copious debugging information")
-    parser.add_option("--resultdir", action="store", type="string", dest="resultdir",
-                      default=None, help="path for resulting files to be put")
+    parser.add_option("--resultdir", action="store", type="string", 
+             default=None, help="path for resulting files to be put")
+    parser.add_option("--statedir", action="store", type="string", default=None,
+            help="path for state dirresulting files to be put")
 
     return parser.parse_args()
     
@@ -671,7 +682,11 @@
     
     if options.resultdir:
         config_opts['resultdir'] = options.resultdir
-        
+
+    if options.statedir:
+        config_opts['statedir'] = options.resultdir
+
+
     try:
         my = Root(config_opts)
         my.prep()
@@ -682,7 +697,7 @@
         sys.exit(100)
 
     my.close()
-    print "Results and/or Logs in: %s" % my.resultdir
+    print "Results and/or logs in: %s" % my.resultdir
 
 
 if __name__ == '__main__':