summaryrefslogtreecommitdiffstats
path: root/manifest_xml.py
diff options
context:
space:
mode:
Diffstat (limited to 'manifest_xml.py')
-rw-r--r--manifest_xml.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index 16476aa5..817a1c80 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -555,6 +555,8 @@ class XmlManifest(object):
555 if d.revisionExpr == '': 555 if d.revisionExpr == '':
556 d.revisionExpr = None 556 d.revisionExpr = None
557 557
558 d.destBranchExpr = node.getAttribute('dest-branch') or None
559
558 sync_j = node.getAttribute('sync-j') 560 sync_j = node.getAttribute('sync-j')
559 if sync_j == '' or sync_j is None: 561 if sync_j == '' or sync_j is None:
560 d.sync_j = 1 562 d.sync_j = 1
@@ -676,6 +678,8 @@ class XmlManifest(object):
676 raise ManifestParseError('invalid clone-depth %s in %s' % 678 raise ManifestParseError('invalid clone-depth %s in %s' %
677 (clone_depth, self.manifestFile)) 679 (clone_depth, self.manifestFile))
678 680
681 dest_branch = node.getAttribute('dest-branch') or self._default.destBranchExpr
682
679 upstream = node.getAttribute('upstream') 683 upstream = node.getAttribute('upstream')
680 684
681 groups = '' 685 groups = ''
@@ -709,7 +713,8 @@ class XmlManifest(object):
709 sync_s = sync_s, 713 sync_s = sync_s,
710 clone_depth = clone_depth, 714 clone_depth = clone_depth,
711 upstream = upstream, 715 upstream = upstream,
712 parent = parent) 716 parent = parent,
717 dest_branch = dest_branch)
713 718
714 for n in node.childNodes: 719 for n in node.childNodes:
715 if n.nodeName == 'copyfile': 720 if n.nodeName == 'copyfile':