From f9cc8c60b56b9174c1501af8ac6c342af725ead2 Mon Sep 17 00:00:00 2001 From: Zhangyifan Date: Fri, 4 Sep 2020 12:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=9Elatin1=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patch-tracking/patch_tracking/cli/generate_password | 2 +- .../patch_tracking/cli/patch_tracking_cli.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/patch-tracking/patch_tracking/cli/generate_password b/patch-tracking/patch_tracking/cli/generate_password index b7772c3f..4bf5861e 100644 --- a/patch-tracking/patch_tracking/cli/generate_password +++ b/patch-tracking/patch_tracking/cli/generate_password @@ -79,7 +79,7 @@ if __name__ == "__main__": err = latin1_encode(password_) if err: usage() - print("PASSWORD: outside the 'latin-1' character set range") + print("PASSWORD: only latin1 character set are allowed") sys.exit(1) ret = password_strength_check(password_) diff --git a/patch-tracking/patch_tracking/cli/patch_tracking_cli.py b/patch-tracking/patch_tracking/cli/patch_tracking_cli.py index d0fab66d..ec712eac 100755 --- a/patch-tracking/patch_tracking/cli/patch_tracking_cli.py +++ b/patch-tracking/patch_tracking/cli/patch_tracking_cli.py @@ -143,10 +143,10 @@ def params_input_track(params, file_path=None): err = latin1_encode(user) if err: - return "error", "user: outside the 'latin-1' character set range" + return "error", "ERROR: user: only latin1 character set are allowed." err = latin1_encode(password) if err: - return "error", "password: outside the 'latin-1' character set range" + return "error", "ERROR: user: only latin1 character set are allowed." enabled = bool(enabled == 'true') @@ -237,10 +237,12 @@ def delete(args): err = latin1_encode(user) if err: - return "error", "user: outside the 'latin-1' character set range" + print("ERROR: user: only latin1 character set are allowed.") + return err = latin1_encode(password) if err: - return "error", "password: outside the 'latin-1' character set range" + print("ERROR: password: Only latin1 character set are allowed.") + return url = '/'.join(['https:/', server, 'tracking']) if args.branch: -- GitLab