Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel393
Commits
1b46274c
Commit
1b46274c
authored
Feb 17, 2017
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+better comment detection in local.conf
parent
cad94273
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
setup.py
setup.py
+13
-9
No files found.
setup.py
View file @
1b46274c
...
...
@@ -80,11 +80,13 @@ def read_local_conf(conf_file,pattern):
with
open
(
conf_file
,
"r"
)
as
f
:
lines
=
f
.
readlines
()
for
line
in
lines
:
if
line
[
0
]
!=
"#"
:
test
=
line
.
find
(
pattern
)
if
test
!=-
1
:
pars
=
line
.
split
(
"="
)[
1
]
.
strip
()
.
strip
(
"
\"
"
)
.
split
(
":"
)
ret
.
append
(
pars
)
line
=
line
.
strip
()
if
len
(
line
)
!=
0
:
if
line
.
strip
()[
0
]
!=
"#"
:
test
=
line
.
find
(
pattern
)
if
test
!=-
1
:
pars
=
line
.
split
(
"="
)[
1
]
.
strip
()
.
strip
(
"
\"
"
)
.
split
(
":"
)
ret
.
append
(
pars
)
return
ret
def
read_local_conf_dev
(
conf_file
,
pattern
):
...
...
@@ -93,10 +95,12 @@ def read_local_conf_dev(conf_file,pattern):
with
open
(
conf_file
,
"r"
)
as
f
:
lines
=
f
.
readlines
()
for
line
in
lines
:
if
line
[
0
]
!=
"#"
:
test
=
line
.
find
(
pattern
)
if
test
!=-
1
:
ret
=
line
.
split
(
"="
)[
1
]
.
strip
()
.
strip
(
"
\"
"
)
line
=
line
.
strip
()
if
len
(
line
)
!=
0
:
if
line
[
0
]
!=
"#"
:
test
=
line
.
find
(
pattern
)
if
test
!=-
1
:
ret
=
line
.
split
(
"="
)[
1
]
.
strip
()
.
strip
(
"
\"
"
)
return
ret
def
update_branch
(
names_from_conf
,
name_from_list
,
pars
,
git_proto
):
...
...
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