From d2fbd6f9aa7b62ed5053db53a715f95a3b475895 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@eagain.net>
Date: Sat, 1 Sep 2007 13:43:01 -0700
Subject: Move commonly used functions to gitosis.util

---
 gitosis/gitweb.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'gitosis/gitweb.py')

diff --git a/gitosis/gitweb.py b/gitosis/gitweb.py
index a814a35..aff0b90 100644
--- a/gitosis/gitweb.py
+++ b/gitosis/gitweb.py
@@ -29,22 +29,14 @@ import os, urllib, logging
 
 from ConfigParser import RawConfigParser, NoSectionError, NoOptionError
 
+from gitosis import util
+
 def _escape_filename(s):
     s = s.replace('\\', '\\\\')
     s = s.replace('$', '\\$')
     s = s.replace('"', '\\"')
     return s
 
-def _getRepositoryDir(config):
-    repositories = os.path.expanduser('~')
-    try:
-        path = config.get('gitosis', 'repositories')
-    except (NoSectionError, NoOptionError):
-        repositories = os.path.join(repositories, 'repositories')
-    else:
-        repositories = os.path.join(repositories, path)
-    return repositories
-
 def generate(config, fp):
     """
     Generate a config file and projects list for ``gitweb``.
@@ -57,7 +49,7 @@ def generate(config, fp):
     """
     log = logging.getLogger('gitosis.access.haveAccess')
 
-    repositories = _getRepositoryDir(config)
+    repositories = util.getRepositoryDir(config)
 
     try:
         global_enable = config.getboolean('gitosis', 'gitweb')
-- 
cgit v1.2.3