diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-04 00:52:41 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-04 00:52:41 +0000 |
| commit | e6dc5c519d408ed7a35c088b9b2236a4434db744 (patch) | |
| tree | ad8527b0f131fd7a02e962d6c4e406c81a793067 /tatsh-overlay.txt | |
| parent | 2024-12-04T00:30:00Z (diff) | |
| download | repos-e6dc5c519d408ed7a35c088b9b2236a4434db744.tar.gz repos-e6dc5c519d408ed7a35c088b9b2236a4434db744.tar.bz2 repos-e6dc5c519d408ed7a35c088b9b2236a4434db744.zip | |
2024-12-04T00:45:00Z
Diffstat (limited to 'tatsh-overlay.txt')
| -rw-r--r-- | tatsh-overlay.txt | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/tatsh-overlay.txt b/tatsh-overlay.txt index 67b4b4a7316c..5ad9db4d2945 100644 --- a/tatsh-overlay.txt +++ b/tatsh-overlay.txt @@ -16,28 +16,20 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay *** syncing tatsh-overlay From https://github.com/Tatsh/tatsh-overlay - + ab005c0c...0c80a3bc master -> origin/master (forced update) -hint: You have divergent branches and need to specify how to reconcile them. -hint: You can do so by running one of the following commands sometime before -hint: your next pull: -hint: -hint: git config pull.rebase false # merge -hint: git config pull.rebase true # rebase -hint: git config pull.ff only # fast-forward only -hint: -hint: You can replace "git config" with "git config --global" to set a default -hint: preference for all repositories. You can also pass --rebase, --no-rebase, -hint: or --ff-only on the command line to override the configured default per -hint: invocation. -fatal: Need to specify how to reconcile divergent branches. -!!! failed syncing tatsh-overlay - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay -*** syncing tatsh-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/tatsh-overlay'... + 0c80a3bc..f502885c master -> origin/master +Updating 0c80a3bc..f502885c +Fast-forward + dev-python/curl-cffi/Manifest | 4 +++ + dev-python/curl-cffi/curl-cffi-0.7.3.ebuild | 24 +++++++++++++++ + .../files/curl-cffi-0001-system-libs.patch | 35 ++++++++++++++++++++++ + dev-python/curl-cffi/metadata.xml | 11 +++++++ + 4 files changed, 74 insertions(+) + create mode 100644 dev-python/curl-cffi/Manifest + create mode 100644 dev-python/curl-cffi/curl-cffi-0.7.3.ebuild + create mode 100644 dev-python/curl-cffi/files/curl-cffi-0001-system-libs.patch + create mode 100644 dev-python/curl-cffi/metadata.xml *** synced tatsh-overlay - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 tatsh-overlay |