diff options
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 050410d4..7fd30420 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -772,8 +772,8 @@ class BranchAndMergePlugin(cliapp.Plugin): stratum = self.load_morphology(repo_dir, morph) for chunk_info in stratum['chunks']: - if chunk_info['ref'] != branch and \ - 'unpetrify-ref' not in chunk_info: + if (chunk_info['ref'] != branch and + 'unpetrify-ref' not in chunk_info): commit_sha1, tree_sha1 = self.app.resolve_ref( self.lrc, self.rrc, chunk_info['repo'], chunk_info['ref'], @@ -1063,8 +1063,8 @@ class BranchAndMergePlugin(cliapp.Plugin): for si in edited_strata: for old_si in to_morph['strata']: # We make no attempt at rename / move detection - if old_si['morph'] == si['morph'] \ - and old_si['repo'] == si['repo']: + if (old_si['morph'] == si['morph'] + and old_si['repo'] == si['repo']): break else: raise cliapp.AppException( |