Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lcgcmake
Manage
Activity
Members
Labels
Plan
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sft
lcgcmake
Commits
19c70fbb
Commit
19c70fbb
authored
10 months ago
by
Andre Sailer
Browse files
Options
Downloads
Patches
Plain Diff
getPlatform: fix possibly using before assignment
parent
8da6f6f9
No related branches found
Branches containing commit
No related tags found
1 merge request
!2254
Fixes for new pylint version: getPlatform et al.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jenkins/getPlatform.py
+5
-11
5 additions, 11 deletions
jenkins/getPlatform.py
with
5 additions
and
11 deletions
jenkins/getPlatform.py
+
5
−
11
View file @
19c70fbb
...
...
@@ -13,15 +13,9 @@ import distro # replacement of platform.linux_distribution https://github.com/ni
arch
=
platform
.
machine
()
system
=
platform
.
system
()
flagarch
=
0
flagcxx
=
0
#---Determine external architecture and extra options----------------
if
os
.
getenv
(
'
ARCHITECTURE
'
):
architecture
=
os
.
getenv
(
'
ARCHITECTURE
'
)
flagarch
=
1
if
os
.
getenv
(
'
CXXOPTIONS
'
):
cxxoptions
=
os
.
getenv
(
'
cxxoptions
'
)
flagcxx
=
1
architecture
=
os
.
getenv
(
'
ARCHITECTURE
'
,
None
)
cxxoptions
=
os
.
getenv
(
'
cxxoptions
'
,
None
)
#---Determine the OS and version--------------------------------------
if
system
==
'
Darwin
'
:
if
int
(
platform
.
mac_ver
()[
0
].
split
(
'
.
'
)[
0
])
>
10
:
...
...
@@ -107,11 +101,11 @@ if buildtype == 'Release' : bt = 'opt'
elif
buildtype
==
'
Debug
'
:
bt
=
'
dbg
'
else
:
bt
=
'
unk
'
if
flagarch
==
1
:
if
architecture
:
print
(
'
%s+%s-%s-%s-%s
'
%
(
arch
,
architecture
,
osvers
,
compiler
,
bt
))
elif
flagcxx
==
1
:
elif
cxxoptions
:
print
(
'
%s+%s-%s-%s-%s
'
%
(
arch
,
cxxoptions
,
osvers
,
compiler
,
bt
))
elif
flagarch
==
1
and
flagcxx
==
1
:
elif
architecture
and
cxxoptions
:
# we can never get here
print
(
'
%s+%s+%s-%s-%s-%s
'
%
(
arch
,
architecture
,
cxxoptions
,
osvers
,
compiler
,
bt
))
else
:
print
(
'
%s-%s-%s-%s
'
%
(
arch
,
osvers
,
compiler
,
bt
))
This diff is collapsed.
Click to expand it.
Andre Sailer
@sailer
mentioned in commit
a1a5c5fb
·
10 months ago
mentioned in commit
a1a5c5fb
mentioned in commit a1a5c5fb1623378300561e8cff28945183f7d240
Toggle commit list
Andre Sailer
@sailer
mentioned in commit
037c9b05
·
10 months ago
mentioned in commit
037c9b05
mentioned in commit 037c9b0568620f69f48d51d49b14160796fa26f3
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment