summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKwanhong Lee <kwanhong.lee@windriver.com>2014-02-17 13:07:32 +0900
committerKwanhong Lee <kwanhong.lee@windriver.com>2014-02-20 11:07:23 +0900
commitccd218cd8f6eeb4dab94b22cec6812d7abb7c814 (patch)
tree5897d64dbc22eb4c39c7a9f4cfaeb4a36200f33d
parentdd6542268a59834ecff573de974d788f11af775d (diff)
downloadgit-repo-ccd218cd8f6eeb4dab94b22cec6812d7abb7c814.tar.gz
Fix to mirror manifest when --mirror is given
Commit 8d201 "repo: Support multiple branches for the same project." (Change id is I5e2f4e1a7abb56f9d3f310fa6fd0c17019330ecd) caused missing mirroring manifest repository when 'repo sync' after 'repo init --mirror'. When the function _AddMetaProjectMirror() is called to add two of meta projects - git-repo itself and manifest repository to mirror, it didn't add them into self._paths which has list of projects to be sync'ed by 'repo sync'. In addition, because member var of Project 'relpath' is used as a key of self._paths, it should be set with proper value other than None. Since this is only for meta projects which are not described in manifest xml, 'relpath' is name of the projects. Change-Id: Icc3b9e6739a78114ec70bf54fe645f79df972686 Signed-off-by: Kwanhong Lee <kwanhong.lee@windriver.com>
-rw-r--r--manifest_xml.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index 3c80d3ce..3c8fadd6 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -568,10 +568,11 @@ class XmlManifest(object):
568 gitdir = gitdir, 568 gitdir = gitdir,
569 objdir = gitdir, 569 objdir = gitdir,
570 worktree = None, 570 worktree = None,
571 relpath = None, 571 relpath = name or None,
572 revisionExpr = m.revisionExpr, 572 revisionExpr = m.revisionExpr,
573 revisionId = None) 573 revisionId = None)
574 self._projects[project.name] = [project] 574 self._projects[project.name] = [project]
575 self._paths[project.relpath] = project
575 576
576 def _ParseRemote(self, node): 577 def _ParseRemote(self, node):
577 """ 578 """