openharmony/third_party_cryptsetup
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_cryptsetup.git synced 2026-07-19 11:53:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(push): compatible py2 unicode py3 str

Browse Source
This commit is contained in:
江畅
2020-08-26 11:26:58 +08:00
parent a273cb0fe9
commit 2b769629f8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
subcmds/push.py
+5 -5
View File
@@ -274,7 +274,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
branch.uploaded = False
have_errors = True
except GitError as e:
print("Error: "+ str(e), file=sys.stderr)
print("Error: "+ unicode(e), file=sys.stderr)
sys.exit(1)
except PullRequestError as e:
branch.pr_error = e
@@ -290,14 +290,14 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
if have_errors:
for branch in todo:
if not branch.uploaded:
if len(str(branch.error)) <= 30:
if len(unicode(branch.error)) <= 30:
fmt = ' (%s)'
else:
fmt = '\n (%s)'
print(('[PUSH FAILED] %-15s %-15s' + fmt) % (
branch.project.relpath + '/',
branch.name,
str(branch.error)),
unicode(branch.error)),
file=sys.stderr)
status_code, msg = branch.project.ForkProject()
if status_code == 201:
@@ -314,14 +314,14 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
if branch.have_pr_errors:
if not branch.pull_requested:
if len(str(branch.pr_error)) <= 30:
if len(unicode(branch.pr_error)) <= 30:
fmt = ' (%s)'
else:
fmt = '\n (%s)'
print(('[PR FAILED] %-15s %-15s' + fmt) % (
branch.project.relpath + '/',
branch.name,
str(branch.pr_error)),
unicode(branch.pr_error)),
file=sys.stderr)
print("'if your PR FAILED ,`repo push` again to create PR after handling the error'", file=sys.stderr)