[mesos] branch master updated: Reverted cleanup step of `verify-reviews.py`.

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tillt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new b53139b  Reverted cleanup step of `verify-reviews.py`.
b53139b is described below

commit b53139b789b67302d8efca0bde214f9e7b22dfa4
Author: Armand Grillet <ag...@mesosphere.io>
AuthorDate: Wed Jan 9 15:42:20 2019 +0100

    Reverted cleanup step of `verify-reviews.py`.
    
    Reverts the improvements made on the support script `verify-reviews.py`
    in 3badf7179992e61f30f5a79da9d481dd451c7c2f. Sadly, these changes have
    broken our Azure based Mesos CI as seen in MESOS-9514.
    
    After comparing the code before and after the commit, we can see that
    the line failing in CI, `HEAD = shell("git rev-parse HEAD")`, is
    misplaced. It was previously located in the exit process in the
    `cleanup()` function and it is now back there, surrounded by a
    try/catch for error handling.
    
    Review: https://reviews.apache.org/r/69697/
---
 support/verify-reviews.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/support/verify-reviews.py b/support/verify-reviews.py
index 72f98b2..04ed7fe 100755
--- a/support/verify-reviews.py
+++ b/support/verify-reviews.py
@@ -98,9 +98,6 @@ def shell(command):
     return out.decode(sys.stdout.encoding)
 
 
-HEAD = shell("git rev-parse HEAD")
-
-
 def api(url, data=None):
     """Call the ReviewBoard API."""
     try:
@@ -171,7 +168,9 @@ def cleanup():
     """Clean the git repository."""
     try:
         shell("git clean -fd")
-        shell("git reset --hard %s" % HEAD)
+        HEAD = shell("git rev-parse HEAD")
+        print(HEAD)
+        shell("git checkout HEAD -- %s" % HEAD)
     except subprocess.CalledProcessError as err:
         print("Failed command: %s\n\nError: %s" % (err.cmd, err.output))