diff options
| author | Klaus Kämpf <kkaempf@suse.de> | 2013-11-18 08:34:53 +0100 |
|---|---|---|
| committer | Michal Minar <miminar@redhat.com> | 2013-11-19 10:25:00 +0100 |
| commit | 8ec93b144b9f095748282fa6e2daf8061bf6ec6b (patch) | |
| tree | a68bf70dff119a701089c576500fadfa7dce6f59 /src/software | |
| parent | d6dfc2d9a7ae462b14fd67e7fa12cb1a29918202 (diff) | |
| download | openlmi-providers-8ec93b144b9f095748282fa6e2daf8061bf6ec6b.tar.gz openlmi-providers-8ec93b144b9f095748282fa6e2daf8061bf6ec6b.tar.xz openlmi-providers-8ec93b144b9f095748282fa6e2daf8061bf6ec6b.zip | |
software: allow tilde presence in package version
OpenSUSE distribution uses tilde character (~) in version of their
packages a lot. This patch allows to parse such packages.
Resolves: bz#1031345
Reported-by: Klaus Kämpf <kkaempf@suse.de>
Diffstat (limited to 'src/software')
| -rw-r--r-- | src/software/lmi/software/util/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/software/lmi/software/util/__init__.py b/src/software/lmi/software/util/__init__.py index 5f601b9..7cfc894 100644 --- a/src/software/lmi/software/util/__init__.py +++ b/src/software/lmi/software/util/__init__.py @@ -36,16 +36,16 @@ RE_INSTANCE_ID = re.compile(r'LMI:(?P<clsname>[a-z][a-z_0-9]+):(?P<id>\d+)', re.IGNORECASE) RE_EVRA = re.compile( - r'^(?P<epoch>\d+):(?P<version>[\w.+{}]+)-(?P<release>[\w.+{}]+)' + r'^(?P<epoch>\d+):(?P<version>[~\w.+{}]+)-(?P<release>[\w.+{}]+)' r'\.(?P<arch>[^.]+)$') RE_NEVRA = re.compile( - r'^(?P<name>.+)-(?P<evra>(?P<epoch>\d+):(?P<version>[\w.+{}]+)' + r'^(?P<name>.+)-(?P<evra>(?P<epoch>\d+):(?P<version>[~\w.+{}]+)' r'-(?P<release>[\w.+{}]+)\.(?P<arch>[^.]+))$') RE_NEVRA_OPT_EPOCH = re.compile( - r'^(?P<name>.+)-(?P<evra>(?:(?P<epoch>\d+):)?(?P<version>[\w.+{}]+)' + r'^(?P<name>.+)-(?P<evra>(?:(?P<epoch>\d+):)?(?P<version>[~\w.+{}]+)' r'-(?P<release>[\w.+{}]+)\.(?P<arch>[^.]+))$') RE_ENVRA = re.compile( - r'^(?P<epoch>\d+):(?P<name>.+)-(?P<evra>(?P<version>[\w.+{}]+)' + r'^(?P<epoch>\d+):(?P<name>.+)-(?P<evra>(?P<version>[~\w.+{}]+)' r'-(?P<release>[\w.+{}]+)\.(?P<arch>[^.]+))$') def _get_distname(): |