diff options
| author | Conley Owens <cco3@android.com> | 2014-08-22 16:13:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-22 16:13:16 +0000 |
| commit | 3a10968a702a2b80ba03e18739d28af40d219912 (patch) | |
| tree | 884a55106d0783670f7a5611e8c68701dedfc810 /manifest_xml.py | |
| parent | c46de6932ac95eb6086a24c6880553f27cf5be44 (diff) | |
| parent | 7a91d51dcfc9516abc38aeaf5462ac55d454bb43 (diff) | |
| download | git-repo-3a10968a702a2b80ba03e18739d28af40d219912.tar.gz | |
Merge "Enable transferring of attribute using command 'repo manifest -o -'"
Diffstat (limited to 'manifest_xml.py')
| -rw-r--r-- | manifest_xml.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index fdc31778..3517c151 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -261,6 +261,8 @@ class XmlManifest(object): | |||
| 261 | revision = self.remotes[remoteName].revision or d.revisionExpr | 261 | revision = self.remotes[remoteName].revision or d.revisionExpr |
| 262 | if not revision or revision != p.revisionExpr: | 262 | if not revision or revision != p.revisionExpr: |
| 263 | e.setAttribute('revision', p.revisionExpr) | 263 | e.setAttribute('revision', p.revisionExpr) |
| 264 | if p.upstream and p.upstream != p.revisionExpr: | ||
| 265 | e.setAttribute('upstream', p.upstream) | ||
| 264 | 266 | ||
| 265 | for c in p.copyfiles: | 267 | for c in p.copyfiles: |
| 266 | ce = doc.createElement('copyfile') | 268 | ce = doc.createElement('copyfile') |