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
28b16c4b
Commit
28b16c4b
authored
7 years ago
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed hardcoded git host
parent
c070acae
master
jethro
rocko
rocko_ethereum
thud
warrior
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
12 deletions
+28
-12
setup.py
setup.py
+28
-12
No files found.
setup.py
View file @
28b16c4b
...
...
@@ -14,6 +14,7 @@ import subprocess
import
os
import
sys
import
shutil
import
re
import
json
from
collections
import
OrderedDict
...
...
@@ -117,20 +118,30 @@ def read_local_conf_dev(conf_file,pattern):
return
ret
def
update_branch
(
names_from_conf
,
name_from_list
,
pars
,
git_proto
):
if
(
git_proto
==
"1"
):
tmp
=
"https://git.elphel.com/Elphel"
if
pars
[
0
]
.
find
(
tmp
)
!=-
1
:
pars
[
0
]
=
"git@git.elphel.com:Elphel"
+
pars
[
0
][
len
(
tmp
):]
else
:
tmp
=
"git@git.elphel.com:Elphel"
if
pars
[
0
]
.
find
(
tmp
)
!=-
1
:
pars
[
0
]
=
"https://git.elphel.com/Elphel"
+
pars
[
0
][
len
(
tmp
):]
for
p
in
names_from_conf
:
if
name_from_list
in
p
:
pars
[
1
]
=
p
[
1
]
# GIT host is defined in projects.json,
# https or git is defined in local.conf
# get host
s0
=
re
.
search
(
"^(https:
\
/
\
/|git@)(.+)(
\
/|:)Elphel.*"
,
pars
[
0
])
if
s0
:
host
=
s0
.
group
(
2
)
print
(
"git host: "
+
host
)
if
(
git_proto
==
"1"
):
tmp
=
"https://"
+
host
+
"/Elphel"
if
pars
[
0
]
.
find
(
tmp
)
!=-
1
:
pars
[
0
]
=
"git@"
+
host
+
":Elphel"
+
pars
[
0
][
len
(
tmp
):]
else
:
tmp
=
"git@"
+
host
+
":Elphel"
if
pars
[
0
]
.
find
(
tmp
)
!=-
1
:
pars
[
0
]
=
"https://"
+
host
+
"/Elphel"
+
pars
[
0
][
len
(
tmp
):]
for
p
in
names_from_conf
:
if
name_from_list
in
p
:
pars
[
1
]
=
p
[
1
]
return
pars
#main
#self pull?
...
...
@@ -266,6 +277,11 @@ MIRRORS =+ "http://.*/.* http://mirror.elphel.com/elphel393_mirror/ \\n "
# 0 (or commented) - for https:// - access using a password
# ELPHEL393_DEV = "1"
# To change git host edit: projects.json (a copy of projects-default.json)
# New git host must match "^(https:
\
/
\
/|git@)(.+)(
\
/|:)Elphel.*", e.g.:
# "https://something.com/Elphel/someproject" or
# "git@something.com:Elphel/someproject"
REMOTE_USER ?= "root"
IDENTITY_FILE ?= "~/.ssh/id_rsa"
COPY_TO_NAND = "0"
...
...
This diff is collapsed.
Click to expand it.
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