https://github.com/fedora-python/ferrypick
Apply patches from Fedora dist git to different components.
https://github.com/fedora-python/ferrypick
cherry-pick fedora git rpm
Last synced: 6 months ago
JSON representation
Apply patches from Fedora dist git to different components.
- Host: GitHub
- URL: https://github.com/fedora-python/ferrypick
- Owner: fedora-python
- License: cc0-1.0
- Created: 2020-06-01T22:51:32.000Z (over 5 years ago)
- Default Branch: master
- Last Pushed: 2020-10-08T15:24:41.000Z (about 5 years ago)
- Last Synced: 2025-03-24T06:45:21.986Z (7 months ago)
- Topics: cherry-pick, fedora, git, rpm
- Language: Python
- Homepage:
- Size: 17.6 KB
- Stars: 2
- Watchers: 8
- Forks: 4
- Open Issues: 2
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
ferrypick
=========
Apply patches from Fedora dist git to different components.
This simple tool does 3 steps:
1. download patch file from src.fedoraproject.org
2. replaces package name with current dist-git work dir package name
3. runs `git am --reject` on the product
Usage:
```
[python36 (f32 %)]$ git switch -c f32-backport
Switched to a new branch 'f32-backport'
[python36 (f32-backport %)]$ ferrypick https://src.fedoraproject.org/rpms/python3.6/pull-request/2
Downloading https://src.fedoraproject.org/rpms/python3.6/pull-request/2.patch
$ git am --reject /tmp/tmp7pa062j6.patch
Applying: Fix python3-config --configdir
Checking patch 00102-lib64.patch...
.git/rebase-apply/patch:26: new blank line at EOF.
+
Checking patch 00205-make-libpl-respect-lib64.patch...
Checking patch python36.spec...
error: while searching for:
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 4%{?dist}
License: Python
error: patch failed: python36.spec:17
error: while searching for:
# ======================================================
%changelog
* Wed May 06 2020 Miro Hrončok - 3.6.10-4
- Rename from python36 to python3.6
error: patch failed: python36.spec:1535
Applied patch 00102-lib64.patch cleanly.
Applied patch 00205-make-libpl-respect-lib64.patch cleanly.
Applying patch python36.spec with 2 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Patch failed at 0001 Fix python3-config --configdir
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".
[python36 (f32-backport *%|AM 1/1)]$ cat python36.spec.rej
diff a/python36.spec b/python36.spec (rejected hunks)
@@ -17,7 +17,7 @@ URL: https://www.python.org/
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 4%{?dist}
+Release: 5%{?dist}
License: Python
@@ -1535,6 +1529,9 @@ CheckPython optimized
# ======================================================
%changelog
+* Thu May 28 2020 Victor Stinner - 3.6.10-5
+- Fix python3-config --configdir (rhbz#1772988).
+
* Wed May 06 2020 Miro Hrončok - 3.6.10-4
- Rename from python36 to python3.6
```
Enjoy.
Beware of non-utf-8 patches
---------------------------
Pagure has a [bug with patches containing non-utf-8 content](https://pagure.io/pagure/issue/4901).
Hence if a commit contains such characters,
always generate the patch file locally (`git format-patch`) and use ferrypick with local patch file,
until the problem is fixed.