Merge ~nacc/git-ubuntu:lint-deconstruct-tag-fix-lp1775041 into git-ubuntu:master

[Nish Aravamudan]

Make jenkins happy

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:b96567d07e0f22dac0c1f3506f1b7234384bc1ef
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/11/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    FAILED: Unit Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:b96567d07e0f22dac0c1f3506f1b7234384bc1ef
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/12/
Executed test runs:
    SUCCESS: VM Setup
    FAILED: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/12/rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

b96567d... by Nish Aravamudan on 2018-06-05

lint: separate check for reconstruct and deconstruct tag

I'm not sure why I wrote the code like this originally, but the intent
was to run every check (even if it doesn't necessarily make any sense to
have a deconstruct tag if there is no a reconstruct tag, in this case).
We will emit all failures as we go through the checks. Currently, we
only check deconstruct if reconstruct exists -- but then we use the
deconstruct tag variable to check against the logical tag. This will
obviously error if the reconstruct tag didn't exist originally.

Also fix a bit of mis-indentation in the code.

LP: #1775041

diff --git a/gitubuntu/lint.py b/gitubuntu/lint.py
index d41045c..b58e46d 100644
--- a/gitubuntu/lint.py
+++ b/gitubuntu/lint.py
@@ -541,25 +541,24 @@ def do_merge_lint(repo, namespace, commitish_string, old, new_base):
     # 2) does reconstruct tag exist?
     # 2a) does import tag treeish match reconstruct tag treeish?
     reconstruct_tag = "%sreconstruct/%s" % (namespace, old_ubuntu_tag_version)
-    if _check_commitish_exists_and_same(
-       repo,
-       import_tag,
-       reconstruct_tag,
-       import_tag,
-    ):
-       # 2b) does deconstruct tag exist?
-       # 2b1) does import tag treeish match deconstruct tag treeish?
-       deconstruct_tag = "%sdeconstruct/%s" % (
-           namespace, old_ubuntu_tag_version
-       )
-       ret = _check_commitish_exists_and_same(
-           repo,
-           import_tag,
-           deconstruct_tag,
-           import_tag,
-       ) and ret
-    else:
-       ret = False
+    ret = _check_commitish_exists_and_same(
+        repo,
+        import_tag,
+        reconstruct_tag,
+        import_tag,
+    ) and ret
+
+    # 2b) does deconstruct tag exist?
+    # 2b1) does import tag treeish match deconstruct tag treeish?
+    deconstruct_tag = "%sdeconstruct/%s" % (
+        namespace, old_ubuntu_tag_version
+    )
+    ret = _check_commitish_exists_and_same(
+        repo,
+        import_tag,
+        deconstruct_tag,
+        import_tag,
+    ) and ret
 
     # 3) does logical tag exist?
     logical_tag = "%slogical/%s" % (