Fix indentation
git-repo uses 2 space indentation. A couple of recent changes
introduced 4 space indentation in some modules.
Change-Id: Ia4250157c1824c1b5e7d555068c4608f995be9da
diff --git a/manifest_xml.py b/manifest_xml.py
index c5e2e34..b3ab098 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -98,7 +98,7 @@
url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName
remoteName = self.name
if self.remoteAlias:
- remoteName = self.remoteAlias
+ remoteName = self.remoteAlias
return RemoteSpec(remoteName, url, self.reviewUrl)
class XmlManifest(object):
@@ -437,9 +437,8 @@
if self._default is None:
self._default = new_default
elif new_default != self._default:
- raise ManifestParseError(
- 'duplicate default in %s' %
- (self.manifestFile))
+ raise ManifestParseError('duplicate default in %s' %
+ (self.manifestFile))
if self._default is None:
self._default = _Default()
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 8d801e0..7d460dd 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -351,13 +351,13 @@
merge_branch = self._GetMergeBranch(branch.project)
full_dest = 'refs/heads/%s' % destination
if not opt.dest_branch and merge_branch and merge_branch != full_dest:
- print('merge branch %s does not match destination branch %s'
- % (merge_branch, full_dest))
- print('skipping upload.')
- print('Please use `--destination %s` if this is intentional'
- % destination)
- branch.uploaded = False
- continue
+ print('merge branch %s does not match destination branch %s'
+ % (merge_branch, full_dest))
+ print('skipping upload.')
+ print('Please use `--destination %s` if this is intentional'
+ % destination)
+ branch.uploaded = False
+ continue
branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
branch.uploaded = True
