From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-619760-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id B8C201381F3
	for <garchives@archives.gentoo.org>; Fri, 16 Aug 2013 14:05:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 426C6E0ED8;
	Fri, 16 Aug 2013 14:05:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DE490E0ED5
	for <gentoo-commits@lists.gentoo.org>; Fri, 16 Aug 2013 14:05:51 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E381633EB6F
	for <gentoo-commits@lists.gentoo.org>; Fri, 16 Aug 2013 14:05:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 70CE9E468F
	for <gentoo-commits@lists.gentoo.org>; Fri, 16 Aug 2013 14:05:49 +0000 (UTC)
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" <dywi@mailerd.de>
Message-ID: <1376661901.83298a990357b3511dcd32b23fa4f4e446f4c79c.dywi@gentoo>
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/
X-VCS-Repository: proj/R_overlay
X-VCS-Files: roverlay/argparser.py roverlay/status.py
X-VCS-Directories: roverlay/
X-VCS-Committer: dywi
X-VCS-Committer-Name: André Erdmann
X-VCS-Revision: 83298a990357b3511dcd32b23fa4f4e446f4c79c
X-VCS-Branch: master
Date: Fri, 16 Aug 2013 14:05:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9d42b83d-ee9e-4d15-8dbd-b937637007de
X-Archives-Hash: e14ab338ad9d7d1aaaa79b3722af53f1

commit:     83298a990357b3511dcd32b23fa4f4e446f4c79c
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 16 14:05:01 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 16 14:05:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=83298a99

status script: accept --module-root arg

This allows to use another user's config file when running in cgi mode.

---
 roverlay/argparser.py |  7 +++++++
 roverlay/status.py    | 14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/roverlay/argparser.py b/roverlay/argparser.py
index 7b7d9e9..0a73c9b 100644
--- a/roverlay/argparser.py
+++ b/roverlay/argparser.py
@@ -594,6 +594,13 @@ class RoverlayStatusArgumentParser ( RoverlayArgumentParser ):
          help='cgi content type',
       )
 
+      arg (
+         '-M', '--module-root', dest='module_root',
+         default=argparse.SUPPRESS, metavar="<dir>",
+         type=couldbe_fs_dir,
+         help="directory for storing cached templates",
+      )
+
 ##      arg (
 ##         '-o', '--template-options', dest='template_options',
 ##         metavar='<option>', action='append',

diff --git a/roverlay/status.py b/roverlay/status.py
index 617aaab..59c8cb6 100644
--- a/roverlay/status.py
+++ b/roverlay/status.py
@@ -211,11 +211,15 @@ class StatusRuntimeEnvironment ( roverlay.runtime.RuntimeEnvironmentBase ):
          raise Exception ( "no template directories found!" )
 
 
-      module_dir = self.config.get ( 'STATS.TEMPLATE.module_dir', None )
-      if module_dir is None:
-         module_dir = self.config.get ( 'CACHEDIR.root', None )
-         if module_dir:
-            module_dir += os.sep + 'mako_templates'
+
+      if 'module_root' in self.options:
+         module_dir = self.options ['module_root']
+      else:
+         module_dir = self.config.get ( 'STATS.TEMPLATE.module_dir', None )
+         if module_dir is None:
+            module_dir = self.config.get ( 'CACHEDIR.root', None )
+            if module_dir:
+               module_dir += os.sep + 'mako_templates'
 
       # use per-version module dirs
       #  modules generated with python2.7 are not compatible with python3.2