mock mock.py,1.31,1.32 mock.spec,1.13,1.14
Seth Vidal (skvidal)
fedora-extras-commits at redhat.com
Tue Dec 27 18:30:28 UTC 2005
Author: skvidal
Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20411
Modified Files:
mock.py mock.spec
Log Message:
apply all of Andreas Thienemann's patches.
fixes rm -rf call to rm -rfv and fixes the mock man page in the package
makefile and specfile.
Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mock.py 12 Nov 2005 19:00:46 -0000 1.31
+++ mock.py 27 Dec 2005 18:30:26 -0000 1.32
@@ -179,7 +179,7 @@
self._umount('dev/pts')
if os.path.exists(self.basedir):
- cmd = '%s -rf %s' % (self.config['rm'], self.basedir)
+ cmd = '%s -rfv %s' % (self.config['rm'], self.basedir)
(retval, output) = self.do(cmd)
if retval != 0:
@@ -589,7 +589,7 @@
# purge the builddir, if it exists
bd_out = '%s%s' % (self.rootdir, self.builddir)
if os.path.exists(bd_out):
- cmd = 'rm -rf %s' % self.builddir
+ cmd = 'rm -rfv %s' % self.builddir
self.do_chroot(cmd, fatal=True)
# create dir structure
Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mock.spec 4 Aug 2005 07:23:01 -0000 1.13
+++ mock.spec 27 Dec 2005 18:30:26 -0000 1.14
@@ -47,12 +47,16 @@
%config(noreplace) %{_sysconfdir}/%{name}/*.cfg
%{_bindir}/%{name}
%{_libexecdir}/mock-yum
+%{_mandir}/man1/mock.1*
%attr(04750, root, mock) %{_sbindir}/mock-helper
%attr(02775, root, mock) %dir /var/lib/mock
%{_libdir}/libselinux-mock.so
%changelog
+* Tue Dec 27 2005 Seth Vidal <skvidal at phy.duke.edu>
+- add patch from Andreas Thienemann - adds man page
+
* Sat Jun 11 2005 Seth Vidal <skvidal at phy.duke.edu>
- security fix in mock-helper
More information about the scm-commits
mailing list