Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
arc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Bugzilla
Bugzilla
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nordugrid
arc
Commits
aee4a35d
Commit
aee4a35d
authored
Feb 07, 2020
by
Andrii Salnikov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rte-remove should be used instead of rtefile_remove (clean on fail case)
parent
8f5d0e7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/utils/python/arc/control/CommunityRTE.py
src/utils/python/arc/control/CommunityRTE.py
+6
-6
No files found.
src/utils/python/arc/control/CommunityRTE.py
View file @
aee4a35d
...
...
@@ -862,7 +862,7 @@ class CommunityRTEControl(ComponentControl):
self
.
logger
.
info
(
'RTE script deployed to %s'
,
rte_path
)
else
:
self
.
logger
.
error
(
'Failed to deploy RTE %s.'
,
rtename
)
self
.
rte
file
_remove
(
args
)
self
.
rte_remove
(
args
)
sys
.
exit
(
1
)
elif
rte_content
is
not
None
:
try
:
...
...
@@ -898,7 +898,7 @@ class CommunityRTEControl(ComponentControl):
if
'checksum_type'
not
in
ditem
:
self
.
logger
.
warning
(
'No checksum defined for URL %s. Software download will be insecure!'
)
if
not
self
.
__ask_yes_no
(
'Are you want to continue?'
):
self
.
rte
file
_remove
(
args
)
self
.
rte_remove
(
args
)
sys
.
exit
(
1
)
downloads
.
append
(
ditem
)
# download into software dir
...
...
@@ -906,7 +906,7 @@ class CommunityRTEControl(ComponentControl):
if
not
swdir
:
self
.
logger
.
error
(
'No software installation directory defined for community %s. '
'Please use "arcctl rte community config-set" first.'
,
c
)
self
.
rte
file
_remove
(
args
)
self
.
rte_remove
(
args
)
sys
.
exit
(
1
)
rte_swdir
=
swdir
.
rstrip
(
'/'
)
+
'/'
+
rtename
cconfig
[
'userconf'
][
'SOFTWARE_DIR'
][
'value'
]
=
rte_swdir
...
...
@@ -918,7 +918,7 @@ class CommunityRTEControl(ComponentControl):
self
.
logger
.
info
(
'Downloading software (file %s) from %s'
,
d
[
'filename'
],
d
[
'url'
])
if
not
self
.
__download_file
(
d
[
'url'
],
swfile
):
self
.
logger
.
error
(
'Download from %s failed.'
,
d
[
'url'
])
self
.
rte
file
_remove
(
args
)
self
.
rte_remove
(
args
)
sys
.
exit
(
1
)
else
:
# calculate checksum
...
...
@@ -937,12 +937,12 @@ class CommunityRTEControl(ComponentControl):
else
:
self
.
logger
.
error
(
'Checksum verification failed for file %s (expected %s, calculated %s)'
,
d
[
'filename'
],
d
[
'checksum_value'
],
h
.
hexdigest
())
self
.
rte
file
_remove
(
args
)
self
.
rte_remove
(
args
)
sys
.
exit
(
1
)
except
ValueError
as
e
:
self
.
logger
.
error
(
'Failed to verify downloaded file (%s) checksum. '
'Error: %s'
,
d
[
'filename'
],
str
(
e
))
self
.
rte
file
_remove
(
args
)
self
.
rte_remove
(
args
)
sys
.
exit
(
1
)
# write community params files (community configured locations)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment