mock ChangeLog, 1.8.2.7, 1.8.2.8 mock.py, 1.53.2.10, 1.53.2.11 mock.spec, 1.16.2.18, 1.16.2.19

[John Clark Williams (jcwillia)]

Author: jcwillia

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

Modified Files:
      Tag: mock-0-6-branch
	ChangeLog mock.py mock.spec 
Log Message:
added --no-clean logic for yum.conf symlink


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -u -r1.8.2.7 -r1.8.2.8
--- ChangeLog	16 Feb 2007 19:16:11 -0000	1.8.2.7
+++ ChangeLog	20 Feb 2007 16:27:35 -0000	1.8.2.8
@@ -1,3 +1,11 @@
+2007-02-20  Clark Williams  <williams at redhat.com>
+
+	* mock.py
+	Handle --no-clean option when doing yum.conf symlink
+	
+	* mock.spec 
+	Bumped version to 0.6.13
+
 2007-02-16  Clark Williams  <williams at redhat.com>
 
 	* mock.py


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.53.2.10
retrieving revision 1.53.2.11
diff -u -r1.53.2.10 -r1.53.2.11
--- mock.py	16 Feb 2007 19:16:11 -0000	1.53.2.10
+++ mock.py	20 Feb 2007 16:27:35 -0000	1.53.2.11
@@ -656,7 +656,10 @@
         # (possible) yum breakage
         yumdir = os.path.join(self.rootdir, 'etc', 'yum')
         self._ensure_dir(yumdir)
-        os.symlink('../yum.conf', os.path.join(yumdir, 'yum.conf'))
+        yumlink = os.path.join(yumdir, 'yum.conf')
+        if os.path.exists(yumlink):
+                os.remove(yumlink)
+        os.symlink('../yum.conf', yumlink)
     
         # files in /etc that need doing
         filedict = self.config['files']


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.16.2.18
retrieving revision 1.16.2.19
diff -u -r1.16.2.18 -r1.16.2.19
--- mock.spec	16 Feb 2007 19:16:11 -0000	1.16.2.18
+++ mock.spec	20 Feb 2007 16:27:35 -0000	1.16.2.19
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.12
+Version: 0.6.13
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -66,6 +66,9 @@
 %{_libdir}/libselinux-mock.so
 
 %changelog
+* Tue Feb 20 2007 Clark Williams <williams at redhat.com> - 0.6.13-1
+- Handle --no-clean option when doing yum.conf symlink
+
 * Fri Feb 16 2007 Clark Williams <williams at redhat.com> - 0.6.12-1
 - added safety symlink for yum.conf