From nobody Tue Sep 05 20:34:47 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgHLJ1h7lz4sdj0; Tue, 5 Sep 2023 20:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgHLJ12Lqz3LN1; Tue, 5 Sep 2023 20:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693946088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFeiFB9qJr4FN12hrKO+z0+He0vS99k2mGLB9d0H6NA=; b=Mwb+auanQyIWEMyxShycbOUE/DblulnMMr5Wn5jKLYR1eTAyzG+ar6I68gpp/6Xqo/KPKm +60M625m0TvxBK38gox9+FRQVp4Crx4HWHLsGh2EerbvrHEoyJQnmc3mfKB+92tzWBUHYU kccO+Qu4t8LbUv4OmHwLszuUqJb5Xr2mFbNmhse3HFMAv2l51jj5hqHr8ec2A0Y+o5GY5K aITjOvW3TdZAM/OeHvLbK08lOxqBdC26Yu4N59PIDY7l0DBNuJ5mZq4P498D0bLstT89td /ZqCiNF3XLwHknrqEAtC+cQzGEmNuzU4nea3BuZKHy+qBKfc8jQdZpH10tehPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693946088; a=rsa-sha256; cv=none; b=GAhAmgumCI0SYoQGIwTH2+2Uc42RM4/uNtjY4yTX8zOOhhGoxk8kTyDp4sbtZplOPezEF2 w4J22fnFZtATD1i/Gk0/OPnsxCC3JBc9+6KleQ9eHo64camAUS7U5gWaST8uc2HBYwVD2V amLTVjKn4OLuArAoUnUAeSSyK6UFcC4bluSoM/x3+csQGoWwxg1dTbnylUYn5J/kKrMk8l 7qiaFmc4JRiZGRoAX4cjCWDjXRRP5nQxImnS9zhAqkv7Dd6p8jNKV8RwuSIcr3dHBts+xF SY68pophmhGwbPgs4axy4AE9FLXzpjBbkT/PiKUDHoUxj+tR0UL/Ax+ZdQmGuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693946088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFeiFB9qJr4FN12hrKO+z0+He0vS99k2mGLB9d0H6NA=; b=YFKpKApMeJZEAMe3VD8O6yqrAmqNJofPCBVjn46nZdHYOcxdctldt8aLDAw+jlCmQ3TSvi 0sGi1VVcfNhM0H5FKAgLZ1hxmid8wG1D8V+cgiRmlFmbM/b7J3gy62ugEvmQYLI7tQHP1e NFpRmJDmeR1aHjOgzpwTAW/gKxMFBmYVBxafglB2wt+A+DBUB6u6dDFRf9ilkyovG1PzQp ohZO9BIU6FMxD5NhpY7pReJCLGrwlrPft22AU4n2MrpX5nfqeZ7LrSJp2AQRZW89PIStxk 2zocTtvRT4LxdRXiCCQi73ZZ0dE+AINkeDPbqBfB2bk0nyPtGVnA+5feTQPZlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RgHLH72sjznCq; Tue, 5 Sep 2023 20:34:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385KYlB1090146; Tue, 5 Sep 2023 20:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385KYlCS090143; Tue, 5 Sep 2023 20:34:47 GMT (envelope-from git) Date: Tue, 5 Sep 2023 20:34:47 GMT Message-Id: <202309052034.385KYlCS090143@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 8a3d82105846 - main - devel/oci-cli: fix termui breakage after upgrade List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a3d821058467a8d3e92219e5b1731820660a32b Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a3d821058467a8d3e92219e5b1731820660a32b commit 8a3d821058467a8d3e92219e5b1731820660a32b Author: Dave Cottlehuber AuthorDate: 2023-09-05 20:34:39 +0000 Commit: Dave Cottlehuber CommitDate: 2023-09-05 20:34:39 +0000 devel/oci-cli: fix termui breakage after upgrade - https://click.palletsprojects.com/en/8.1.x/changes/#version-8-1-0 - https://github.com/oracle/oci-cli/pull/684 - https://github.com/oracle/oci-cli/issues/661 --- ...i__object__storage_objectstorage__cli__extended.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py b/devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py new file mode 100644 index 000000000000..8f65bae844f7 --- /dev/null +++ b/devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py @@ -0,0 +1,19 @@ +--- services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py.orig 2023-06-07 19:09:16 UTC ++++ services/object_storage/src/oci_cli_object_storage/objectstorage_cli_extended.py +@@ -11,6 +11,7 @@ import os.path + import math + import os + import os.path ++import shutil + import stat + import sys + from mimetypes import guess_type +@@ -3079,7 +3080,7 @@ def _get_progress_bar_label(original_label, object_nam + else: + # If the names are too long then we can end up with multiple progress bars since we overflow a single line. To prevent + # this, make sure that the label won't consume more than half the terminal width +- terminal_width = click.termui.get_terminal_size()[0] / 2 ++ terminal_width = shutil.get_terminal_size()[0] / 2 + remaining_width = terminal_width - (len(prefix) + 1) + + if len(object_name) > remaining_width: