diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-08-21 00:31:40 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-08-21 00:31:40 +0000 |
| commit | a2972d539c6cef7a035127e23a1d4ef6db22412d (patch) | |
| tree | 5b96020e80d997f974f46fbff7597eae4c68d524 /wayland-desktop.txt | |
| parent | 2022-08-21T00:15:01Z (diff) | |
| download | repos-a2972d539c6cef7a035127e23a1d4ef6db22412d.tar.gz repos-a2972d539c6cef7a035127e23a1d4ef6db22412d.tar.bz2 repos-a2972d539c6cef7a035127e23a1d4ef6db22412d.zip | |
2022-08-21T00:30:01Z
Diffstat (limited to 'wayland-desktop.txt')
| -rw-r--r-- | wayland-desktop.txt | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/wayland-desktop.txt b/wayland-desktop.txt index 3971f993b26f..ea5b719d0ce3 100644 --- a/wayland-desktop.txt +++ b/wayland-desktop.txt @@ -16,10 +16,29 @@ $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync wayland-des ERROR:pkgcore:Cannot write cache for /usr/lib/python3.10/site-packages/pkgcore/plugins/plugincache: [Errno 13] Permission denied: '/usr/lib64/python3.10/site-packages/pkgcore/plugins/.update.plugincache'. Try running pplugincache. *** syncing wayland-desktop From https://github.com/bsd-ac/wayland-desktop - + b850228...74c162f master -> origin/master (forced update) -Already up to date. + 74c162f..4b5e157 master -> origin/master +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 wayland-desktop + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync wayland-desktop +ERROR:pkgcore:Cannot write cache for /usr/lib/python3.10/site-packages/pkgcore/plugins/plugincache: [Errno 13] Permission denied: '/usr/lib64/python3.10/site-packages/pkgcore/plugins/.update.plugincache'. Try running pplugincache. +*** syncing wayland-desktop +Cloning into '/var/lib/repo-mirror-ci/sync/wayland-desktop'... *** synced wayland-desktop - * Sync succeeded + * Sync succeeded after re-adding $ 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 wayland-desktop |