diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-11-10 11:42:42 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-11-10 11:42:42 -0600 |
| commit | 0e133c157755908d05c44c3a36b1dc0668e1d111 (patch) | |
| tree | ea130b60114ade926462cb1516eb1a16fbd7c013 /src/lib/Bcfg2/DBSettings.py | |
| parent | ca78be11051dab7421a414fc3ae4104c82f1f9e7 (diff) | |
| download | bcfg2-0e133c157755908d05c44c3a36b1dc0668e1d111.tar.gz bcfg2-0e133c157755908d05c44c3a36b1dc0668e1d111.tar.bz2 bcfg2-0e133c157755908d05c44c3a36b1dc0668e1d111.zip | |
Options: Fixed non-path database name parsing
The database name is sometimes a path (SQLite) and sometimes not
(MySQL, PostgreSQL). This introduces a new Option type,
RepositoryMacroOption, that expands <repository> macros without
canonicalizing the path, so SQLite users can use <repository> in their
settings but MySQL users' database name settings will not be destroyed
by path canonicalization.
The unfortunate downside is that SQLite users can't use ~ in their
database name.
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index a8f88d3d4..982a299c0 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -211,7 +211,7 @@ class _OptionContainer(object): Bcfg2.Options.Option( cf=('database', 'engine'), default='sqlite3', help='Database engine', dest='db_engine'), - Bcfg2.Options.PathOption( + Bcfg2.Options.RepositoryMacroOption( cf=('database', 'name'), default='<repository>/etc/bcfg2.sqlite', help="Database name", dest="db_name"), Bcfg2.Options.Option( |