Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
noc
noc
Commits
74e1d38b
Verified
Commit
74e1d38b
authored
Aug 16, 2019
by
Dmitry Volodin
Browse files
Remove newline from version info
parent
5fb7bd3b
Pipeline
#15263
passed with stages
in 12 minutes and 9 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
core/fileutils.py
View file @
74e1d38b
...
...
@@ -149,7 +149,7 @@ def urlopen(url, auto_deflate=False):
setup_urllib_proxies
()
if
url
.
startswith
(
"http://"
)
or
url
.
startswith
(
"https://"
):
r
=
Request
(
url
,
headers
=
{
"User-Agent"
:
"NOC/%s"
%
version
.
version
})
r
=
Request
(
url
,
headers
=
{
"User-Agent"
:
"NOC/%s"
%
version
.
version
.
strip
()
})
else
:
r
=
url
if
auto_deflate
and
url
.
endswith
(
".gz"
):
...
...
core/version.py
View file @
74e1d38b
...
...
@@ -76,10 +76,10 @@ class Version(object):
[
"git"
,
"describe"
,
"--tags"
,
"--abbrev=%d"
%
CHANGESET_LEN
]
)
if
"-"
not
in
v
:
return
v
return
v
.
strip
()
r
=
v
.
rsplit
(
"-"
,
2
)
if
len
(
r
)
<
3
:
return
v
return
v
.
strip
()
v
,
n
,
cs
=
r
return
"%s+%s.%s.%s"
%
(
v
,
self
.
branch
,
n
,
cs
[
1
:
CHANGESET_LEN
+
1
])
else
:
...
...
Andrey Vertiprahov
@aversant
mentioned in commit
4a6cb93a
·
Aug 16, 2019
mentioned in commit
4a6cb93a
mentioned in commit 4a6cb93a2e8b049b9f3410d8e9171a28725fb28d
Toggle commit list
Dmitry Volodin
@dv
mentioned in merge request
!2483 (merged)
·
Aug 16, 2019
mentioned in merge request
!2483 (merged)
mentioned in merge request !2483
Toggle commit list
Andrey Vertiprahov
@aversant
mentioned in commit
56868af9
·
Aug 16, 2019
mentioned in commit
56868af9
mentioned in commit 56868af954e61fd900180145111f196907ca4f0b
Toggle commit list
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment