mock README,1.3,1.4 mock.py,1.4,1.5 mock.spec,1.1.1.1,1.2

[Seth Vidal (skvidal)]

Author: skvidal

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

Modified Files:
	README mock.py mock.spec 
Log Message:

- allow users other than uid=500,gid=500
- fix warnings in mock-helper
- fix umount of proc and devpts



Index: README
===================================================================
RCS file: /cvs/fedora/mock/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	16 May 2005 15:04:44 -0000	1.3
+++ README	19 May 2005 14:24:40 -0000	1.4
@@ -25,9 +25,7 @@
 - outputs little unless it needs to.
 
 
-TODO: make other UID/GID's than 500 work
 TODO: document more
 TODO: man page?
 TODO: symlink fedora-development-i386-core.cfg to default.cfg
 TODO: changelog
-TODO: check on it working with yum 2.2.X on FC3/EL4, too.


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mock.py	16 May 2005 15:07:51 -0000	1.4
+++ mock.py	19 May 2005 14:24:40 -0000	1.5
@@ -28,7 +28,7 @@
 
 from optparse import OptionParser
 
-__VERSION__ = '0.1'
+__VERSION__ = '0.2'
 
 def error(msg):
     print >> sys.stderr, msg
@@ -315,7 +315,7 @@
 
     def _mount(self):
         """mount proc and devpts into chroot"""
-        mf = os.path.join(self.statedir, 'mounted')
+        mf = os.path.join(self.statedir, 'mounted-locations')
         track = open(mf, 'w+')
 
         # make the procdir if we don't have it
@@ -340,9 +340,7 @@
         devptsdir = os.path.join(self.rootdir, 'dev/pts')
         self._ensure_dir(devptsdir)
         self.debug("mounting devpts in %s" % devptsdir)
-        command = '%s -t devpts -o uid=%s,gid=%s devpts %s' % (
-           self.config['mount'], self.config['chrootuid'], 
-           self.config['chrootgid'], devptsdir)
+        command = '%s -t devpts devpts %s' % (self.config['mount'], devptsdir)
         track.write('dev/pts\n')
         (retval, output) = self.do(command)
         track.flush()


Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- mock.spec	16 May 2005 02:44:00 -0000	1.1.1.1
+++ mock.spec	19 May 2005 14:24:40 -0000	1.2
@@ -1,13 +1,13 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.1
+Version: 0.2
 Release: 1
 License: GPL
 Group: Development/Tools
 Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}root
 BuildRequires: gcc
-Requires: python, yum >= 2.3.2
+Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 
 
@@ -29,10 +29,11 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -r mock >/dev/null 2>&1
+groupadd -r mock >/dev/null 2>&1 || :
 
 %postun
-groupdel mock >/dev/null 2>&1
+groupdel mock >/dev/null 2>&1 || :
+
 
 %files
 %defattr(-, root, root)
@@ -45,5 +46,8 @@
 
 
 %changelog
+* Thu May 19 2005 Seth Vidal <skvidal at phy.duke.edu>
+- second packaging and backing down the yum ver req
+
 * Sun May 15 2005 Seth Vidal <skvidal at phy.duke.edu>
 - first version/packaging