[Mach-cvs] CVS: mach2/scripts mach.in,1.253,1.254

[Thomas V. S. <tho...@us...>]

Update of /cvsroot/mach/mach2/scripts
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5637/scripts

Modified Files:
	mach.in 
Log Message:
	* scripts/mach.in:
	  More permission fixes based on feedback from Fredrik Unger.



Index: mach.in
===================================================================
RCS file: /cvsroot/mach/mach2/scripts/mach.in,v
retrieving revision 1.253
retrieving revision 1.254
diff -C2 -d -r1.253 -r1.254
*** mach.in	29 Jun 2009 13:51:21 -0000	1.253
--- mach.in	14 Nov 2009 16:43:55 -0000	1.254
***************
*** 1060,1064 ****
--- 1060,1070 ----
          srcs['local.%s' % root] = line
          debug ('creating sources list with dict %r' % srcs)
+         
+         # This avoids getting errors like
+         # chmod: changing permissions of `/usr/src/rpm/RPMS/repodata': Operation
+         # not permitted
+         self.do_chroot ("chown -R %d:%d /usr/src/rpm/RPMS" % (os.getuid (), os.getgid ()), fatal = True)
          create_sources_list (self.config, srcs)
+         self.do_chroot ("chown -R %s:%s /usr/src/rpm/RPMS" % (builduser, buildgroup), fatal = True)
  
          try:
***************
*** 1804,1807 ****
--- 1810,1815 ----
      def _ensure_machbuild_permissions (self):
          # make sure all files in /usr/src/@PKGDIR@ are writable by the group
+         self.do_chroot ("chown -R :%s /usr/src/@PKGDIR@" % buildgroup,
+             fatal = True)
          self.do_chroot ("%s -c 'chmod -R g+w /usr/src/@PKGDIR@' %s" %
              (self.config['runuser'], builduser), fatal = True)