Skip to content
GitLab
Explore
Sign in
archlinux
archversion
Compare revisions
0cc6f62a35fc2c8619d951bda60f134109ddb04b to 2ec638ec4b45e6d87f23d9eaeececbf222748bd0
Commits on Source (3)
Fix eval_downstream not executed
· 86320e60
Seblu
authored
Sep 19, 2021
86320e60
Fix invalid use of "is not"
· da7b4b5d
Seblu
authored
Sep 19, 2021
da7b4b5d
Allow use of re module in eval_ functions
· 2ec638ec
Seblu
authored
Sep 19, 2021
2ec638ec
Hide whitespace changes
Inline
Side-by-side
src/lib/archversion/version.py
View file @
2ec638ec
...
...
@@ -105,7 +105,7 @@ class VersionController(object):
# apply eval to upstream
e_upstream
=
value
.
get
(
"
eval_upstream
"
,
None
)
if
e_upstream
is
not
None
:
v_upstream
=
eval
(
e_upstream
,
{},
{
"
version
"
:
v_upstream
})
v_upstream
=
eval
(
e_upstream
,
{
"
re
"
:
re
},
{
"
version
"
:
v_upstream
})
logging
.
debug
(
"
eval_upstream produce version: %s
"
%
v_upstream
)
# save upstream version
if
self
.
_cache
[
"
upstream
"
].
get
(
name
,
{}).
get
(
"
version
"
,
None
)
!=
v_upstream
:
...
...
@@ -121,9 +121,9 @@ class VersionController(object):
# get downstream version
v_downstream
=
self
.
get_version_downstream
(
name
,
value
,
mode
)
# apply eval to downstream
e_
compare
=
value
.
get
(
"
eval_downstream
"
,
None
)
if
e_
compare
is
not
None
:
v_
compare
=
eval
(
e_compare
,
{
},
{
"
version
"
:
v_
compare
})
e_
downstream
=
value
.
get
(
"
eval_downstream
"
,
None
)
if
e_
downstream
is
not
None
:
v_
downstream
=
eval
(
e_downstream
,
{
"
re
"
:
re
},
{
"
version
"
:
v_
downstream
})
logging
.
debug
(
"
eval_downstream produce version: %s
"
%
v_downstream
)
# save downstream version
if
self
.
_cache
[
"
downstream
"
].
get
(
name
,
{}).
get
(
"
version
"
,
None
)
!=
v_downstream
:
...
...
@@ -379,7 +379,7 @@ class VersionController(object):
# print upstream
toprint
+=
"
%sup: %s
"
%
(
c_yellow
,
v1
)
# print downstream
if
v2
is
not
""
:
if
v2
!=
""
:
# print separator
toprint
+=
"
%s|
"
%
c_blue
origin
=
self
.
_packages
.
get
(
name
,{}).
get
(
"
downstream
"
,
"
downstream
"
)
...
...