diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-10-17 00:16:42 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-10-17 00:16:42 +0000 |
| commit | 6184399e23c88411f5cffc20050f869be0272903 (patch) | |
| tree | ed5fe2057dfed00262b65ef514ad48740df8e47d /nymphos.txt | |
| parent | 2022-10-17T00:00:01Z (diff) | |
| download | repos-6184399e23c88411f5cffc20050f869be0272903.tar.gz repos-6184399e23c88411f5cffc20050f869be0272903.tar.bz2 repos-6184399e23c88411f5cffc20050f869be0272903.zip | |
2022-10-17T00:15:01Z
Diffstat (limited to 'nymphos.txt')
| -rw-r--r-- | nymphos.txt | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/nymphos.txt b/nymphos.txt index 6ad602ddd755..f478804b7d44 100644 --- a/nymphos.txt +++ b/nymphos.txt @@ -14,13 +14,29 @@ $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. *** syncing nymphos From https://github.com/neeshy/nymphos - 87a2f6f..a8259c8 master -> origin/master -Updating 87a2f6f..a8259c8 -Fast-forward - dev-libs/atk/files/at-spi2-core-split-atk.patch | 46 +++++++++++++++++-------- - 1 file changed, 31 insertions(+), 15 deletions(-) + + a8259c8...6e0e799 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 nymphos + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync nymphos +ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. +*** syncing nymphos +Cloning into '/var/lib/repo-mirror-ci/sync/nymphos'... *** synced nymphos - * 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 nymphos |