From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-813595-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 BCFB7138CEE
	for <garchives@archives.gentoo.org>; Fri, 19 Jun 2015 19:53:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 46C1014042;
	Fri, 19 Jun 2015 19:53:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id BAA9314042
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2015 19:53:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 1B467340CD1
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2015 19:53:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A933DA5F
	for <gentoo-commits@lists.gentoo.org>; Fri, 19 Jun 2015 19:52:57 +0000 (UTC)
From: "Devan Franchini" <twitch153@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" <twitch153@gentoo.org>
Message-ID: <1434743514.9f682ae6eaa6b51d38e0d842dd7e65ca7ed89e54.twitch153@gentoo>
Subject: [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
X-VCS-Repository: proj/webapp-config
X-VCS-Files: WebappConfig/config.py
X-VCS-Directories: WebappConfig/
X-VCS-Committer: twitch153
X-VCS-Committer-Name: Devan Franchini
X-VCS-Revision: 9f682ae6eaa6b51d38e0d842dd7e65ca7ed89e54
X-VCS-Branch: master
Date: Fri, 19 Jun 2015 19:52:57 +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: 3f523b09-a99c-4672-a983-5160f024d519
X-Archives-Hash: 02589ed9f02dbf2be024ade6bbdd0e66

commit:     9f682ae6eaa6b51d38e0d842dd7e65ca7ed89e54
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 03:19:16 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 19:51:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=9f682ae6

config.py: Readds the "dir" key to the option_to_config term

 WebappConfig/config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 8d6a0ae..ab19ee3 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -892,6 +892,7 @@ class Config:
 
         # Map command line options into the configuration
         option_to_config = {'host'         : 'vhost_hostname',
+                            'dir'          : 'g_installdir',
                             'server'       : 'vhost_server',
                             'secure'       : 'g_secure',
                             'user'         : 'vhost_config_uid',