From 7e5e2fc5dbff029a0420fb73f5038047d9f7c1c0 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 28 Jun 2008 02:38:33 +0000
Subject: Make cache-file umask configurable.

svn:r286
---
 config.py      | 4 +++-
 rank.py        | 2 ++
 updateCache.py | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config.py b/config.py
index 175a3d5..c1b1b6e 100644
--- a/config.py
+++ b/config.py
@@ -4,12 +4,14 @@ import re
 
 _KEYS = [ "ALL_TAGS",
           "ALPHABETIZE_AUTHOR_AS","AUTHOR_URLS","CACHE_DIR","CACHE_SECTIONS",
+          "CACHE_UMASK",
           "CITE_CACHE_DIR",
           "COLLAPSE_AUTHORS",
           "DOWNLOAD_CONNECT_TIMEOUT","INITIAL_STRINGS",
           "MASTER_BIB", "NO_COLLAPSE_AUTHORS", "OMIT_ENTRIES",
           "OUTPUT_DIR", "TEMPLATE_FILE", "BIBTEX_TEMPLATE_FILE",
-          "REQUIRE_KEY", "TAG_TITLES", "TAG_DIRECTORIES", "TAG_SHORT_TITLES" ]
+          "REQUIRE_KEY", "TAG_TITLES", "TAG_DIRECTORIES", "TAG_SHORT_TITLES",
+          ]
 
 for _k in _KEYS:
     globals()[_k]=None
diff --git a/rank.py b/rank.py
index 16e1d8f..76ca181 100644
--- a/rank.py
+++ b/rank.py
@@ -125,6 +125,8 @@ if __name__ == '__main__':
    # First download the bibliography file.
    import BibTeX
    config.load(sys.argv[1])
+   if config.CACHE_UMASK != None:
+      os.umask(config.CACHE_UMASK)
    bib = BibTeX.parseFile(config.MASTER_BIB)
    remove_old()
    print "Downloading missing ranks."
diff --git a/updateCache.py b/updateCache.py
index 3bf346c..7b7fe64 100755
--- a/updateCache.py
+++ b/updateCache.py
@@ -18,8 +18,6 @@ import socket
 import errno
 import httplib
 
-os.umask(022)
-
 FILE_TYPES = [ "txt", "html", "pdf", "ps", "ps.gz", "abstract" ]
 BIN_FILE_TYPES = [ 'pdf', 'ps.gz' ]
 
@@ -164,5 +162,8 @@ if __name__ == '__main__':
         sys.exit(1)
     config.load(sys.argv[1])
 
+    if config.CACHE_UMASK != None:
+        os.umask(config.CACHE_UMASK)
+
     bib = BibTeX.parseFile(config.MASTER_BIB)
     downloadAll(bib,missingOnly=1)
-- 
cgit v1.2.3-70-g09d2