Merge lp:~raharper/curtin/trunk.fix-my-garbage into lp:~curtin-dev/curtin/trunk

[Scott Moser]

Remove previously committed garbage print and yakkety pep failure

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

FAILED: Continuous integration, rev:453
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~raharper/curtin/trunk.fix-my-garbage/+merge/316654/+edit-commit-message

https://jenkins.ubuntu.com/server/job/curtin-ci/331/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/331
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/331

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:453
https://jenkins.ubuntu.com/server/job/curtin-ci/332/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/332
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/332
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/332
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-amd64/332
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/332

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

review: Approve (continuous-integration)

=== modified file 'curtin/block/__init__.py'
--- curtin/block/__init__.py	2017-02-06 20:16:35 +0000
+++ curtin/block/__init__.py	2017-02-07 23:35:38 +0000
@@ -746,7 +746,6 @@
     """
     Obtain an exclusive file-handle to the file/device specified
     """
-    print('exclusive_open running')
     mode = 'rb+'
     fd = None
     if not os.path.exists(path):

=== modified file 'tests/vmtests/__init__.py'
--- tests/vmtests/__init__.py	2017-02-07 18:57:35 +0000
+++ tests/vmtests/__init__.py	2017-02-07 23:35:38 +0000
@@ -750,8 +750,8 @@
             return fp.read()
 
     def load_log_file(self, filename):
-        with open(filename, 'rb') as l:
-            return l.read().decode('utf-8', errors='replace')
+        with open(filename, 'rb') as fp:
+            return fp.read().decode('utf-8', errors='replace')
 
     def get_install_log_curtin_version(self):
         # curtin: Installation started. (%s)