Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
Hdlmake
Manage
Activity
Members
Labels
Plan
Issues
20
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
Hdlmake
Commits
e34d5b12
Commit
e34d5b12
authored
12 years ago
by
Tomasz Wlostowski
Committed by
Pawel Szostek
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
path.py: remove unnecessary print() call
parent
b5278c58
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/path.py
+21
-20
21 additions, 20 deletions
src/path.py
with
21 additions
and
20 deletions
src/path.py
+
21
−
20
View file @
e34d5b12
...
...
@@ -37,7 +37,7 @@ ise_path_32 = {"10.0":"/opt/Xilinx/10.0/ISE/bin/lin",
"
12.1
"
:
"
/opt/Xilinx/12.1/ISE_DS/ISE/bin/lin
"
,
"
12.4
"
:
"
/opt/Xilinx/12.4/ISE_DS/ISE/bin/lin64
"
,
"
13.1
"
:
"
/opt/Xilinx/13.1/ISE_DS/ISE/bin/lin64
"
}
def
url_parse
(
url
):
"""
Check if link to a repo seems to be correct. Filter revision number and branch
...
...
@@ -49,17 +49,16 @@ def url_parse(url):
url_clean = url_match.group(1)
if url_match.group(3) != None: #there is a branch
branch = url_match.group(3)
if url_match.group(5) != None: #there is a revision given
if url_match.group(5) != None: #there is a revision given
rev = url_match.group(5)
"""
url_clean
,
branch
,
rev
=
None
,
None
,
None
if
"
@@
"
in
url
:
url_clean
,
rev
=
url
.
split
(
"
@@
"
)
url_clean
,
rev
=
url
.
split
(
"
@@
"
)
elif
"
::
"
in
url
:
url_clean
,
branch
=
url
.
split
(
"
::
"
)
url_clean
,
branch
=
url
.
split
(
"
::
"
)
else
:
url_clean
=
url
url_clean
=
url
p
.
vprint
(
str
(
url_clean
)
+
"
"
+
str
(
branch
)
+
"
"
+
str
(
rev
))
return
(
url_clean
,
branch
,
rev
)
def
url_basename
(
url
):
...
...
@@ -80,16 +79,20 @@ def svn_basename(url):
try
:
words
=
words
[
1
].
split
(
'
/
'
)
return
'
/
'
.
join
(
words
[
1
:])
except
:
except
IndexError
:
return
None
def
pathsplit
(
p
,
rest
=
[]):
(
h
,
t
)
=
os
.
path
.
split
(
p
)
def
pathsplit
(
p
,
rest
=
None
):
if
rest
is
None
:
rest
=
[]
(
h
,
t
)
=
os
.
path
.
split
(
p
)
if
len
(
h
)
<
1
:
return
[
t
]
+
rest
if
len
(
t
)
<
1
:
return
[
h
]
+
rest
return
pathsplit
(
h
,[
t
]
+
rest
)
return
pathsplit
(
h
,
[
t
]
+
rest
)
def
commonpath
(
l1
,
l2
,
common
=
[]):
def
commonpath
(
l1
,
l2
,
common
=
None
):
if
common
is
None
:
common
=
[]
if
len
(
l1
)
<
1
:
return
(
common
,
l1
,
l2
)
if
len
(
l2
)
<
1
:
return
(
common
,
l1
,
l2
)
if
l1
[
0
]
!=
l2
[
0
]:
return
(
common
,
l1
,
l2
)
...
...
@@ -108,7 +111,7 @@ def is_abs_path(path):
if
s
==
'
/
'
:
return
True
return
False
def
relpath
(
p1
,
p2
=
None
):
if
p2
==
None
:
p2
=
os
.
getcwd
()
...
...
@@ -120,15 +123,13 @@ def relpath(p1, p2 = None):
if
p2
[
-
1
]
==
'
/
'
:
p2
=
p2
[:
-
1
]
(
common
,
l1
,
l2
)
=
commonpath
(
pathsplit
(
p1
),
pathsplit
(
p2
))
(
_
,
l1
,
l2
)
=
commonpath
(
pathsplit
(
p1
),
pathsplit
(
p2
))
p
=
[]
if
len
(
l1
)
>
0
:
p
=
[
'
../
'
*
len
(
l1
)
]
p
=
p
+
l2
return
os
.
path
.
join
(
*
p
)
return
os
.
path
.
join
(
*
p
)
#def filter_files(files, extension):
#
def
rel2abs
(
path
,
base
=
None
):
"""
...
...
@@ -140,18 +141,18 @@ def rel2abs(path, base = None):
The base is intelligently concatenated to the given relative path.
@return the relative path of path from base
"""
if
os
.
path
.
isabs
(
path
):
return
path
retval
=
os
.
path
.
join
(
base
,
path
)
if
os
.
path
.
isabs
(
path
):
return
path
retval
=
os
.
path
.
join
(
base
,
path
)
return
os
.
path
.
abspath
(
retval
)
def
search_for_manifest
(
search_path
):
"""
Look for manifest in the given folder
"""
import
msg
as
p
p
.
vprint
(
"
Looking for manifest in
"
+
search_path
)
for
filename
in
os
.
listdir
(
search_path
):
if
filename
==
"
manifest.py
"
and
not
os
.
path
.
isdir
(
filename
):
return
os
.
path
.
abspath
(
os
.
path
.
join
(
search_path
,
filename
))
# no manifest file found
return
None
\ No newline at end of file
return
None
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment