Skip to content

Commit 39b1307

Browse files
mgomersbachmyii
mgomersbach
authored and
myii
committed
fix(map.jinja): fix useflags regex (gentoo)
* fix(map.jinja): fix useflags regex When using version inside useflag, the sls_block macro with ebuildpkg regex result in a range error. Replacing the version argument with uses seem to work as escapes don't really work there. fix(map.jinja): replace all problematic lines fix(map.jinja): update available targets ``` ---------- ID: php_install_imagick_dev-php-pecl-imagick Function: pkg.installed Name: dev-php/pecl-imagick Result: False Comment: An exception occurred in this state: Traceback (most recent call last): File "/usr/lib64/python3.6/site-packages/salt/state.py", line 1933, in call **cdata['kwargs']) File "/usr/lib64/python3.6/site-packages/salt/loader.py", line 1951, in wrapper return f(*args, **kwargs) File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 1563, in installed **kwargs) File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 651, in _find_install_targets for name, version in desired.items() File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 652, in <listcomp> if not (name in cur_pkgs and (version is None or _fulfills_version_string(cur_pkgs[name], version))) File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 216, in _fulfills_version_string fullfills_all = fullfills_all and _fulfills_version_spec([installed_version], operator, version_string, ignore_epoch=ignore_epoch) File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 234, in _fulfills_version_spec if (oper == '==' and fnmatch.fnmatch(ver, desired_version)) \ File "/usr/lib64/python3.6/fnmatch.py", line 36, in fnmatch return fnmatchcase(name, pat) File "/usr/lib64/python3.6/fnmatch.py", line 70, in fnmatchcase match = _compile_pattern(pat) File "/usr/lib64/python3.6/fnmatch.py", line 46, in _compile_pattern return re.compile(res).match File "/usr/lib64/python3.6/re.py", line 233, in compile return _compile(pattern, flags) File "/usr/lib64/python3.6/re.py", line 301, in _compile p = sre_compile.compile(pattern, flags) File "/usr/lib64/python3.6/sre_compile.py", line 562, in compile p = sre_parse.parse(p, flags) File "/usr/lib64/python3.6/sre_parse.py", line 855, in parse p = _parse_sub(source, pattern, flags & SRE_FLAG_VERBOSE, 0) File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub not nested and not items)) File "/usr/lib64/python3.6/sre_parse.py", line 765, in _parse p = _parse_sub(source, state, sub_verbose, nested + 1) File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub not nested and not items)) File "/usr/lib64/python3.6/sre_parse.py", line 553, in _parse raise source.error(msg, len(this) + 1 + len(that)) sre_constants.error: bad character range 7-3 at position 20 Started: 14:28:26.927898 Duration: 6321.149 ms Changes: ``` * Use single-quoting Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>
1 parent 0090c91 commit 39b1307

File tree

1 file changed

+25
-14
lines changed

1 file changed

+25
-14
lines changed

‎php/map.jinja‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2679,7 +2679,7 @@
26792679
},
26802680
}, merge=True) %}
26812681
{%- else %}
2682-
{%- set useversion = php_version | replace(".", "-") -%}
2682+
{%- set useversion = php_version | replace('.', '-') -%}
26832683
{#- Red Hat Softwarecollection prefix lookup belongs to the Red Hat part
26842684
further down but has to go here due to Jinja parsing rules. -#}
26852685
{%- if salt['pillar.get']('php:use_scl_repo', False) -%}
@@ -2820,57 +2820,68 @@
28202820
},
28212821
'Gentoo' : {
28222822
'pkgs': {
2823+
'adodb': 'dev-php/adodb',
28232824
'apache2': [{'name': 'dev-lang/php','version': ':' + php_version + '[apache2]'}],
2824-
'apc': [{'name': 'dev-php/pecl-apcu_bc','version': '[php_targets_php' + useversion + ']'}],
2825-
'apcu': [{'name': 'dev-php/pecl-apcu','version': '[php_targets_php' + useversion + ']'}],
2825+
'apc': [{'name': 'dev-php/pecl-apcu_bc','uses': '[php_targets_php' + useversion + ']'}],
2826+
'apcu': [{'name': 'dev-php/pecl-apcu', 'uses': '[php_targets_php' + useversion + ']'}],
28262827
'bcmath': [{'name': 'dev-lang/php','version': ':' + php_version + '[bcmath]'}],
28272828
'bz2': [{'name': 'dev-lang/php','version': ':' + php_version + '[bzip2]'}],
28282829
'cache-lite': 'dev-php/PEAR-Cache_Lite',
28292830
'cgi': [{'name': 'dev-lang/php','version': ':' + php_version + '[cgi]'}],
28302831
'cli': [{'name': 'dev-lang/php','version': ':' + php_version + '[cli]'}],
2832+
'composer': 'dev-php/composer',
28312833
'composer_bin': 'composer',
28322834
'console-table': 'dev-php/PEAR-Console_Table',
2835+
'ctype': [{'name': 'dev-lang/php','version': ':' + php_version + '[ctype]'}],
28332836
'curl': [{'name': 'dev-lang/php','version': ':' + php_version + '[curl]'}],
28342837
'ext_conf_path': '/etc/php/fpm-php' + php_version + '/ext',
2838+
'fileinfo': [{'name': 'dev-lang/php','version': ':' + php_version + '[fileinfo]'}],
2839+
'filter': [{'name': 'dev-lang/php','version': ':' + php_version + '[filter]'}],
28352840
'fpm': [{'name': 'dev-lang/php','version': ':' + php_version + '[fpm]'}],
28362841
'gd': [{'name': 'dev-lang/php','version': ':' + php_version + '[gd]'}],
2837-
'geoip': [{'name': 'dev-php/pecl-geoip','version': '[php_targets_php' + useversion + ']'}],
2842+
'geoip': [{'name': 'dev-php/pecl-geoip','uses': '[php_targets_php' + useversion + ']'}],
28382843
'gettext': 'dev-php/PEAR-File_Gettext',
28392844
'gmp': [{'name': 'dev-lang/php','version': ':' + php_version + '[gmp]'}],
2840-
'imagick': [{'name': 'dev-php/pecl-imagick','version': '[php_targets_php' + useversion + ']'}],
2845+
'hash': [{'name': 'dev-lang/php','version': ':' + php_version + '[hash]'}],
2846+
'iconv': [{'name': 'dev-lang/php','version': ':' + php_version + '[iconv]'}],
2847+
'imagick': [{'name': 'dev-php/pecl-imagick','uses': '[php_targets_php' + useversion + ']'}],
28412848
'imap': [{'name': 'dev-lang/php','version': ':' + php_version + '[imap]'}],
28422849
'intl': [{'name': 'dev-lang/php','version': ':' + php_version + '[intl]'}],
28432850
'json': [{'name': 'dev-lang/php','version': ':' + php_version + '[json]'}],
28442851
'ldap': [{'name': 'dev-lang/php','version': ':' + php_version + '[ldap]'}],
28452852
'local_bin': '/usr/local/bin',
28462853
'auth-sasl': 'dev-php/PEAR-Auth_SASL',
28472854
'mail': 'dev-php/PHPMailer',
2848-
'memcache': [{'name': 'dev-php/pecl-memcache','version': '[php_targets_php' + useversion + ']'}],
2849-
'memcached': [{'name': 'dev-php/pecl-memcached','version': '[php_targets_php' + useversion + ']'}],
2850-
'mongo': [{'name': 'dev-php/pecl-mongo','version': '[php_targets_php' + useversion + ']'}],
2851-
'mongodb': [{'name': 'dev-php/pecl-mongodb','version': '[php_targets_php' + useversion + ']'}],
2855+
'memcache': [{'name': 'dev-php/pecl-memcache','uses': '[php_targets_php' + useversion + ']'}],
2856+
'memcached': [{'name': 'dev-php/pecl-memcached','uses': '[php_targets_php' + useversion + ']'}],
2857+
'mcrypt': [{'name': 'dev-php/pecl-mcrypt','uses': '[php_targets_php' + useversion + ']'}],
2858+
'mongo': [{'name': 'dev-php/pecl-mongo','uses': '[php_targets_php' + useversion + ']'}],
2859+
'mongodb': [{'name': 'dev-php/pecl-mongodb','uses': '[php_targets_php' + useversion + ']'}],
28522860
'mysqlnd': [{'name': 'dev-lang/php','version': ':' + php_version + '[mysql]'}],
28532861
'mysql': [{'name': 'dev-lang/php','version': ':' + php_version + '[mysqli]'}],
28542862
'net-smtp': 'dev-php/PEAR-Net_SMTP',
28552863
'net4': 'dev-php/PEAR-Net_IPv4',
28562864
'net6': 'dev-php/PEAR-Net_IPv6',
2857-
'oauth': [{'name': 'dev-php/pecl-oauth','version': '[php_targets_php' + useversion + ']'}],
2865+
'oauth': [{'name': 'dev-php/pecl-oauth','uses': '[php_targets_php' + useversion + ']'}],
28582866
'opcache': [{'name': 'dev-lang/php','version': ':' + php_version + '[opcache]'}],
28592867
'pear': 'dev-php/pear',
28602868
'pgsql': [{'name': 'dev-lang/php','version': ':' + php_version + '[postgres]'}],
28612869
'php': [{'name': 'dev-lang/php','version': ':' + php_version}],
28622870
'pspell': [{'name': 'dev-lang/php','version': ':' + php_version + '[spell]'}],
2863-
'redis': [{'name': 'dev-php/pecl-redis','version': '[php_targets_php' + useversion + ']'}],
2871+
'redis': [{'name': 'dev-php/pecl-redis','uses': '[php_targets_php' + useversion + ']'}],
2872+
'session': [{'name': 'dev-lang/php','version': ':' + php_version + '[session]'}],
28642873
'snmp': [{'name': 'dev-lang/php','version': ':' + php_version + '[snmp]'}],
28652874
'soap': [{'name': 'dev-lang/php','version': ':' + php_version + '[soap]'}],
2866-
'ssh2': [{'name': 'dev-php/pecl-ssh2','version': '[php_targets_php' + useversion + ']'}],
2875+
'ssh2': [{'name': 'dev-php/pecl-ssh2','uses': '[php_targets_php' + useversion + ']'}],
28672876
'sqlite': [{'name': 'dev-lang/php','version': ':' + php_version + '[sqlite]'}],
2868-
'sybase': [{'name': 'dev-lang/php','version': ':' + php_version + '[sybase-ct]'}],
28692877
'tcpdf': 'dev-php/tcpdf',
28702878
'temp_dir': '/tmp',
28712879
'tidy': [{'name': 'dev-lang/php','version': ':' + php_version + '[tidy]'}],
2872-
'xdebug': [{'name': 'dev-lang/php','version': ':' + php_version + '[debug]'}],
2880+
'tokenizer': [{'name': 'dev-lang/php','version': ':' + php_version + '[tokenizer]'}],
2881+
'uuid': [{'name': 'dev-php/pecl-uuid','uses': '[php_targets_php' + useversion + ']'}],
2882+
'xdebug': [{'name': 'dev-php/xdebug','uses': '[php_targets_php' + useversion + ']'}],
28732883
'xml': [{'name': 'dev-lang/php','version': ':' + php_version + '[xml]'}],
2884+
'xmlwriter': [{'name': 'dev-lang/php','version': ':' + php_version + '[xmlwriter]'}],
28742885
'xsl': [{'name': 'dev-lang/php','version': ':' + php_version + '[xslt]'}],
28752886
'zip': [{'name': 'dev-lang/php','version': ':' + php_version + '[zip]'}],
28762887
},

0 commit comments

Comments
 (0)