Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
50d13ba5
Commit
50d13ba5
authored
Aug 06, 2012
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed xml name generation in run.py
parent
9981b283
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
run.py
modules/ts/misc/run.py
+11
-9
No files found.
modules/ts/misc/run.py
View file @
50d13ba5
...
@@ -337,10 +337,9 @@ class RunInfo(object):
...
@@ -337,10 +337,9 @@ class RunInfo(object):
def
getSvnVersion
(
self
,
path
,
name
):
def
getSvnVersion
(
self
,
path
,
name
):
if
not
path
:
if
not
path
:
setattr
(
self
,
name
,
None
)
val
=
None
return
elif
not
self
.
svnversion_path
and
hostos
==
'nt'
:
if
not
self
.
svnversion_path
and
hostos
==
'nt'
:
val
=
self
.
tryGetSvnVersionWithTortoise
(
path
,
name
)
self
.
tryGetSvnVersionWithTortoise
(
path
,
name
)
else
:
else
:
svnversion
=
self
.
svnversion_path
svnversion
=
self
.
svnversion_path
if
not
svnversion
:
if
not
svnversion
:
...
@@ -348,11 +347,14 @@ class RunInfo(object):
...
@@ -348,11 +347,14 @@ class RunInfo(object):
try
:
try
:
output
=
Popen
([
svnversion
,
"-n"
,
path
],
stdout
=
PIPE
,
stderr
=
PIPE
)
.
communicate
()
output
=
Popen
([
svnversion
,
"-n"
,
path
],
stdout
=
PIPE
,
stderr
=
PIPE
)
.
communicate
()
if
not
output
[
1
]:
if
not
output
[
1
]:
setattr
(
self
,
name
,
output
[
0
])
val
=
output
[
0
]
else
:
else
:
setattr
(
self
,
name
,
None
)
val
=
None
except
OSError
:
except
OSError
:
setattr
(
self
,
name
,
None
)
val
=
None
if
val
:
val
=
val
.
replace
(
" "
,
"_"
)
setattr
(
self
,
name
,
val
)
def
tryGetSvnVersionWithTortoise
(
self
,
path
,
name
):
def
tryGetSvnVersionWithTortoise
(
self
,
path
,
name
):
try
:
try
:
...
@@ -371,9 +373,9 @@ class RunInfo(object):
...
@@ -371,9 +373,9 @@ class RunInfo(object):
tmpfile
=
open
(
tmpfilename2
,
"r"
)
tmpfile
=
open
(
tmpfilename2
,
"r"
)
version
=
tmpfile
.
read
()
version
=
tmpfile
.
read
()
tmpfile
.
close
()
tmpfile
.
close
()
setattr
(
self
,
name
,
version
)
return
version
except
:
except
:
setattr
(
self
,
name
,
None
)
return
None
finally
:
finally
:
if
dir
:
if
dir
:
shutil
.
rmtree
(
dir
)
shutil
.
rmtree
(
dir
)
...
...
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