Created attachment 234031 [details] trivial update of Makefile and distinfo
Patch didn't apply. Applying: Updating oci tools error: patch failed: devel/oci-cli/files/patch-setup.py:1 error: devel/oci-cli/files/patch-setup.py: patch does not apply Patch failed at 0001 Updating oci tools 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".
interesting, what command did you run Koichiro? Patch was generated by running "git format-patch main", as explained here: https://docs.freebsd.org/en/books/porters-handbook/upgrading/#git-diff
ok, I managed to reproduce the issue by running "git apply --check ..." command and attached patch file. I am wondering if using git format-patch is still recommended to generate patch files? Or should I generate an unified diff with "git diff --staged > ../`make -VPKGNAME`.diff"? Thank you, Alessandro
Created attachment 234033 [details] trivial update of Makefile and distinfo Updating a unified diff
Gotcha! The patch you submitted in Bug 263098 was not committed as-is. Some minor modifications are made by dch@. When you create a new patch, please be sure to make it based clean git repo. Not your local state.
Created attachment 234034 [details] trivial update of Makefile and distinfo
Hello Koichiro, thanks so much for your follow-up on this! I created a new patch: this time, running "git apply --check 0001-Updating-oci-tools.patch" shows no errors, could you please confirm everything looks good for you, too? Thank you
(In reply to Alessandro Sagratini from comment #7) Patch itself LGTM but it reverts deletions in devel/oci-cli/files/patch-setup.py. Some lines are deleted by dch@ (minor modifications). You and dch@ need to have a talk about that changes. https://cgit.freebsd.org/ports/commit/?id=3ba9f4569c14a3fa44e1e46a53efe3164a1f92c4
thanks Koichiro! I'll clean up as needed and commit it shortly, if thats ok for you.
Alessandro - generally its not worth forcing the python dependencies so tightly unless the port really really requires those specific versions. It will make it very difficult for the py-cryptography maintainers, for example. Given you're always updating oci-cli & py-oci in lockstep, we could simply have: ... - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.2.1<=3.4.7:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=3.2.1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oci=2.62.1:devel/py-oci@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oci>=2.68.0:devel/py-oci@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=19.1.0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.16:devel/py-prompt-toolkit@${PY_FLAVOR} \ and assume that python stuff with "Just Work" with point updates. I'm not a python expert, but this feels reasonably ok to me. I bow to yourself or meta@ if this is not a good move. wrt setup.py patch, AFAICT ports doesn't care about this so I think we could remove it entirely. either way, LGTM, I'm ok to commit this as is, or with above changes as you like.
(In reply to Dave Cottlehuber from comment #9) Yeah, I'll leave it to you.
Created attachment 234044 [details] trivial update of Makefile and distinfo
(In reply to Dave Cottlehuber from comment #10) That makes sense, most Python libraries, including these, do not really enforce dependencies, so I updated the patch to reflect your suggestions, thank you!
thanks, applied with minor tweaks to appease git & patch in 14de85b34cf790769e2b45f179eadc988dabbcbb & 7c46913e630a52c486ff95b2774b66f4a513fe22.