mock ChangeLog, 1.8.2.6, 1.8.2.7 mock.py, 1.53.2.9, 1.53.2.10 mock.spec, 1.16.2.17, 1.16.2.18

[John Clark Williams (jcwillia)]

Author: jcwillia

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

Modified Files:
      Tag: mock-0-6-branch
	ChangeLog mock.py mock.spec 
Log Message:
added safety symlink for yum breakage in rawhide


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/mock/ChangeLog,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -r1.8.2.6 -r1.8.2.7
--- ChangeLog	7 Feb 2007 15:40:31 -0000	1.8.2.6
+++ ChangeLog	16 Feb 2007 19:16:11 -0000	1.8.2.7
@@ -1,6 +1,12 @@
+2007-02-16  Clark Williams  <williams at redhat.com>
+
+	* mock.py
+	Added safety symlink to handle possible yum breakage in rawhide
+
 2007-02-07  Clark Williams  <williams at redhat.com>
 
-	* Added error() calls to print command output on failed commands
+	* mock.py
+	Added error() calls to print command output on failed commands
 
 2007-02-06  Clark Williams  <williams at redhat.com>
 


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.53.2.9
retrieving revision 1.53.2.10
diff -u -r1.53.2.9 -r1.53.2.10
--- mock.py	7 Feb 2007 15:40:31 -0000	1.53.2.9
+++ mock.py	16 Feb 2007 19:16:11 -0000	1.53.2.10
@@ -652,6 +652,11 @@
         yumconf_fo = open(yumconf, 'w')
         yumconf_content = self.config['yum.conf']
         yumconf_fo.write(yumconf_content)
+        # symlink /etc/yum.conf to /etc/yum/yum.conf to deal with
+        # (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'))
     
         # 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.17
retrieving revision 1.16.2.18
diff -u -r1.16.2.17 -r1.16.2.18
--- mock.spec	7 Feb 2007 15:40:31 -0000	1.16.2.17
+++ mock.spec	16 Feb 2007 19:16:11 -0000	1.16.2.18
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.6.11
+Version: 0.6.12
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -66,6 +66,9 @@
 %{_libdir}/libselinux-mock.so
 
 %changelog
+* Fri Feb 16 2007 Clark Williams <williams at redhat.com> - 0.6.12-1
+- added safety symlink for yum.conf
+
 * Wed Feb  7 2007 Clark Williams <williams at redhat.com> - 0.6.11-1
 - added error() calls to print command output on failed commands