Only write repo.stats and repo.fails when the repoman user has write access to /var...

svn path=/main/trunk/; revision=5360

diff --git a/bin/repoman b/bin/repoman
index adb9e6b8377358b8e4654265eb9dc22d71a24f7f..0cc74f42672b21e5320eb754dd3822f8959f748e 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -1371,18 +1371,14 @@ for x in scanlist:
                fails["ebuild.allmasked"].append(x)
 
 #Pickle and save results for instant reuse in last and lfull
-savef=open('/var/cache/edb/repo.stats','w')
-pickle.dump(stats,savef)
-savef.close()
-savef=open('/var/cache/edb/repo.fails','w')
-pickle.dump(fails,savef)
-savef.close()
-if not (os.stat('/var/cache/edb/repo.stats')[ST_GID] == getgrnam('portage')[2]):
-       os.chown('/var/cache/edb/repo.stats',os.geteuid(),getgrnam('portage')[2])
-       os.chmod('/var/cache/edb/repo.stats',0664)
-if not (os.stat('/var/cache/edb/repo.fails')[ST_GID] == getgrnam('portage')[2]):
-       os.chown('/var/cache/edb/repo.fails',os.geteuid(),getgrnam('portage')[2])
-       os.chmod('/var/cache/edb/repo.fails',0664)
+if os.access(portage_const.CACHE_PATH, os.W_OK):
+       for myobj, fname in (stats, "repo.stats"), (fails, "repo.fails"):
+               fpath = os.path.join(portage_const.CACHE_PATH, fname)
+               savef = open(fpath, 'w')
+               pickle.dump(myobj, savef)
+               savef.close()
+               portage.apply_secpass_permissions(fpath, gid=portage.portage_gid,
+                       mode=0664)
 if quiet < 2:
        print
 #dofail will be set to 1 if we have failed in at least one non-warning category