diff options
| author |   André Erdmann <dywi@mailerd.de> | 2014-02-22 15:26:44 +0100 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2014-02-22 15:35:32 +0100 |
| commit | 580f55bc730343381d0d6f596867a6601f821d28 (patch) | |
| tree | c75208aa3d6cf0fc35fc2b99b8af84ac02de5384 /roverlay/config | |
| parent | roverlay/depres, rule reader: properly count files (diff) | |
| download | R_overlay-580f55bc730343381d0d6f596867a6601f821d28.tar.gz R_overlay-580f55bc730343381d0d6f596867a6601f821d28.tar.bz2 R_overlay-580f55bc730343381d0d6f596867a6601f821d28.zip | |
roverlay/util/fileio: support xz compression
* roverlay/util/fileio:
** read/write_text_file(): add support for xz
** read_text_file(): catch compression-related errors
for the first text line only
** read_text_file(): make sure to close the file(!)
** TextFile: add get_default_compression()
* move SUPPORTED_COMPRESSION dict to roverlay/util/compression
* roverlay/config/entrymap: use roverlay/util/compression
* roverlay/db/distmap: get_default_compression()
Diffstat (limited to 'roverlay/config')
| -rw-r--r-- | roverlay/config/entrymap.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py index eb24b39..b53d5a6 100644 --- a/roverlay/config/entrymap.py +++ b/roverlay/config/entrymap.py @@ -47,6 +47,8 @@ known dict keys are 'path', 'description'/'desc' and 'value_type': __all__ = [ 'CONFIG_ENTRY_MAP', 'prune_description', ] +import roverlay.util.compression + fs_file = 'fs_file' fs_abslist = 'list:fs_abs' yesno = 'yesno' @@ -60,6 +62,10 @@ is_yesno = { 'value_type' : 'yesno' } CAPSLOCK = ( 'CAPSLOCK', ) LOG_LEVEL = ( "DEBUG", "INFO", "WARN", "WARNING", "ERROR", "CRITICAL" ) +COMP_FORMATS = [ "default", "none" ] + sorted ( + roverlay.util.compression.get_all_compression_formats() + ##roverlay.util.compression.get_supported_compression_formats() +) is_log_level = { 'choices' : LOG_LEVEL, 'flags' : CAPSLOCK } @@ -324,10 +330,10 @@ CONFIG_ENTRY_MAP = dict ( ), overlay_distmap_compression = dict ( - description = 'distmap compression format (none, bzip2 or gzip)', - choices = frozenset ({ - 'none', 'default', 'bz2', 'bzip2', 'gz', 'gzip' - }), + description = 'distmap compression format ({})'.format ( + ', '.join ( COMP_FORMATS ) + ), + choices = COMP_FORMATS, ), overlay_distmap_file = dict ( |