[game-data-packager] 01/01: document new options in /etc/game-data-packager.conf

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit b8159e812b35051fe299525210a2c934120714be
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Fri Oct 2 13:13:31 2015 +0200

    document new options in /etc/game-data-packager.conf
---
 etc/game-data-packager.conf  | 6 +++++-
 game_data_packager/config.py | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/etc/game-data-packager.conf b/etc/game-data-packager.conf
index 88b6124..2a4f5d9 100644
--- a/etc/game-data-packager.conf
+++ b/etc/game-data-packager.conf
@@ -1,6 +1,10 @@
 # game-data-packager.conf
-# arguments accept "yes" or "no"
 
+# arguments accept "yes" or "no"
 INSTALL="no"	# install the generated package on the local system
 PRESERVE="yes"	# not preserve the generated package file(s)
 VERBOSE="no"    # show output from external tools
+
+# arguments are program names
+INSTALL_METHOD=""      # uses apt 1.1 if available, or dpkg
+GAIN_ROOT_COMMAND="su" # su
diff --git a/game_data_packager/config.py b/game_data_packager/config.py
index f5146b0..229a7c6 100644
--- a/game_data_packager/config.py
+++ b/game_data_packager/config.py
@@ -23,7 +23,7 @@ from .paths import CONFIG
 logger = logging.getLogger('game-data-packager.config')
 
 COMMENT = re.compile(r'#.*')
-OPTION = re.compile('^([A-Z]+)=(["\']?)(.*)\\2$')
+OPTION = re.compile('^([A-Z_]+)=(["\']?)(.*)\\2$')
 
 def read_config():
     """The world's simplest shell script parser.
@@ -55,6 +55,8 @@ def read_config():
                             config[k] = True
                         elif v == 'no':
                             config[k] = False
+                        elif k in ('install_method', 'gain_root_command'):
+                            config[k] = v
                         else:
                             logger.warning('%s:%d: unknown option value: %s=%r',
                                     CONFIG, lineno, k, v)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git