Summary: | devel/py-oci: update to 2.119.1 and devel/oci-cli to 3.37.5 | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | Ports & Packages | Reporter: | Alessandro Sagratini <ale_sagra> | ||||||||||
Component: | Individual Port(s) | Assignee: | Koichiro Iwao <meta> | ||||||||||
Status: | Closed FIXED | ||||||||||||
Severity: | Affects Only Me | CC: | dch, meta | ||||||||||
Priority: | --- | ||||||||||||
Version: | Latest | ||||||||||||
Hardware: | Any | ||||||||||||
OS: | Any | ||||||||||||
URL: | https://github.com/oracle/oci-python-sdk/releases/tag/v2.119.1 | ||||||||||||
Attachments: |
|
Description
Alessandro Sagratini
2024-01-23 08:47:43 UTC
The patch doesn't apply. Could you check? right, I tried and the patch doesn't seem to apply for me as well, it's interesting because I generated it as usual with git format-patch main. I will check and get back to you What error are you getting while applying the patch, Koichiro? Thank you if I try to apply patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276625 bug, I get: [username@hostname /usr/ports]$ patch -p0 --dry-run < cdk.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 614f2c1b53f1205b3c2c81b862c2dc908fe5b0a4 Mon Sep 17 00:00:00 2001 |From: "Thomas E. Dickey" <dickey@invisible-island.net> |Date: Thu, 25 Jan 2024 19:22:36 -0500 |Subject: [PATCH 5/9] devel/cdk: update to 5.0.20230201 | |--- | devel/cdk/Makefile | 7 ++++--- | devel/cdk/distinfo | 6 +++--- | devel/cdk/pkg-plist | 2 -- | 3 files changed, 7 insertions(+), 8 deletions(-) | |diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile |index 513650bf4d21..d970afbb46a0 100644 |--- a/devel/cdk/Makefile |+++ b/devel/cdk/Makefile -------------------------- File to patch: Is this the same error you are getting? Thank you Here it is. % curl -L 'https://bz-attachments.freebsd.org/attachment.cgi?id=247873' | git am % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 4400 0 4400 0 0 2814 0 --:--:-- 0:00:01 --:--:-- 2816 Applying: Bumping py-oci to 2.119.1 and oci-cli to 3.37.5 error: patch failed: devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py:1 error: devel/oci-cli/files/patch-services_object__storage_src_oci__cli__object__storage_objectstorage__cli__extended.py: patch does not apply Patch failed at 0001 Bumping py-oci to 2.119.1 and oci-cli to 3.37.5 hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Created attachment 248057 [details]
trivial update of Makefile and distinfo
runnijng a "git apply 0001-Bumping-py-oci-to-2.119.1-and-oci-cli-to-3.37.5.patch" works for me locally: would you mind checking if everything is fine for you, as well? Thank you
Created attachment 248060 [details]
trivial update of Makefile and distinfo
updating new file
Created attachment 248061 [details]
trivial update of Makefile and distinfo
Now I could apply your new patch, will commit soon. awesome, thank you for your help Koichiro! A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=98811c93a7c61176d10e233bf8ec469719d54aad commit 98811c93a7c61176d10e233bf8ec469719d54aad Author: Alessandro Sagratini <alessandro.sagratini@gmail.com> AuthorDate: 2024-01-29 12:30:40 +0000 Commit: Koichiro Iwao <meta@FreeBSD.org> CommitDate: 2024-01-30 10:02:42 +0000 devel/{py-oci,oci-cli}: Update to 2.119.1 / 3.37.5 PR: 276549 Changes: https://github.com/oracle/oci-python-sdk/releases/tag/v2.119.1 Changes: https://github.com/oracle/oci-cli/releases/tag/v3.37.5 devel/oci-cli/Makefile | 4 ++-- devel/oci-cli/distinfo | 6 +++--- ...ct__storage_objectstorage__cli__extended.py (gone) | 19 ------------------- devel/py-oci/Makefile | 2 +- devel/py-oci/distinfo | 6 +++--- 5 files changed, 9 insertions(+), 28 deletions(-) Committed, thanks! |