# HG changeset patch
# User haftmann
# Date 1147159085 -7200
# Node ID 2042422ac7d8d4f1b67071dd1c4e26f4a799d7a6
# Parent  a1e630503c57db8833828469c9a659b8d28796b6
improved chmod/chgrp handling

diff -r a1e630503c57 -r 2042422ac7d8 Admin/website/build/make_dep.bash
--- a/Admin/website/build/make_dep.bash	Mon May 08 21:40:40 2006 +0200
+++ b/Admin/website/build/make_dep.bash	Tue May 09 09:18:05 2006 +0200
@@ -46,10 +46,10 @@
     echo '	-chgrp $(TARGET_GROUP) $(dir $@)' >> "$DEP_FILE"
     echo '	-[ -e $@ ] && rm $@' >> "$DEP_FILE"
     echo '	$(PYTHON) build/pypager.py --dtd="dtd/" $(FORCE_ENC_CMD) --srcroot="." --dstroot="$(OUTPUTROOT)" distname="$(DISTNAME)" $< $@' >> "$DEP_FILE"
+    echo '	chmod $(TARGET_UMASK_FILE) $@' >> "$DEP_FILE"
+    echo '	chgrp $(TARGET_GROUP) $@' >> "$DEP_FILE"
     echo '	$(PYTHON) build/obfusmail.py --dtd="dtd/" $@' >> "$DEP_FILE"
     echo '	-$(TIDYCMD) $@' >> "$DEP_FILE"
-    echo '	chmod $(TARGET_UMASK_FILE) $@' >> "$DEP_FILE"
-    echo '	chgrp $(TARGET_GROUP) $@' >> "$DEP_FILE"
     allhtml="$allhtml$outputfile "
     echo >> "$DEP_FILE"
 done
diff -r a1e630503c57 -r 2042422ac7d8 Admin/website/build/obfusmail.py
--- a/Admin/website/build/obfusmail.py	Mon May 08 21:40:40 2006 +0200
+++ b/Admin/website/build/obfusmail.py	Tue May 09 09:18:05 2006 +0200
@@ -132,7 +132,11 @@
     baremail = "%s@%s" % (name, host)
     imgname = (name + "_" + host).replace(".", "_") + ".png"
     imgfile = path.join(path.split(htmlfile)[0], imgname)
+    mod = os.stat(htmlfile).st_mode
+    gid = os.stat(htmlfile).st_gid
     cmd("convert label:'%s' '%s'" % (baremail, imgfile))
+    os.chmod(imgfile, mod)
+    os.chown(imgfile, -1, gid)
     if arg is not None:
         mailsimple = u"{%s} AT [%s] WITH (%s)" % (name, host, arg)
         mailscript = u" ".join(map(mk_line, ['<a href="', "mailto:", name, "@", host, "?", arg, '">']));
@@ -174,7 +178,7 @@
         mails_subst = {}
         for mail in mails.iterkeys():
             mails_subst[mail] = obfuscate(mail, filename)
-    
+
         # transform pages
         istream = StringIO(open(filename, 'r').read())
         ostream = open(filename, 'wb')