Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.buildout
Commits
92a1ac67
Commit
92a1ac67
authored
Jun 08, 2018
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
install_monitor: handle submodules
describes the options, but in fact ignore them for now
parent
6f60a5eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
src/zc/buildout/install_monitor.py
src/zc/buildout/install_monitor.py
+12
-1
No files found.
src/zc/buildout/install_monitor.py
View file @
92a1ac67
...
@@ -66,7 +66,18 @@ class GitInstallMonitor(object):
...
@@ -66,7 +66,18 @@ class GitInstallMonitor(object):
def
_record_changes
(
self
,
message
):
def
_record_changes
(
self
,
message
):
start
=
time
.
time
()
start
=
time
.
time
()
self
.
_logger
.
debug
(
"Adding %s to git, this may take some time"
,
self
.
_work_tree
)
self
.
_logger
.
debug
(
"Adding %s to git, this may take some time"
,
self
.
_work_tree
)
if
self
.
_git
(
"status"
,
"--porcelain"
):
# One problem is that buildout directory contain git repositories, wich `git add` below
# will treat as submodules.
# I see several options:
# * add the content of these git repositories as normal files using plumbing commands (see
# https://www.git-scm.com/book/en/v2/Git-Internals-Git-Objects)
# * manage them as submodules (see https://stackoverflow.com/a/4162672 https://stackoverflow.com/a/4185579
# because git add does not seem to make a managed submodule )
# * just ignore them.
#
# for now, they are ignored.
if
self
.
_git
(
"status"
,
"--ignore-submodules"
,
"--porcelain"
):
self
.
_git
(
"add"
,
self
.
_work_tree
)
self
.
_git
(
"add"
,
self
.
_work_tree
)
self
.
_git
(
"commit"
,
"-m"
,
message
)
self
.
_git
(
"commit"
,
"-m"
,
message
)
self
.
_logger
.
debug
(
"Added %s to git in %.2f seconds"
,
self
.
_work_tree
,
time
.
time
()
-
start
)
self
.
_logger
.
debug
(
"Added %s to git in %.2f seconds"
,
self
.
_work_tree
,
time
.
time
()
-
start
)
...
...
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