diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-03 15:01:28 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-03 15:01:28 +0000 |
| commit | 9f787997eddd96890e87c604fd192562c6d3f438 (patch) | |
| tree | 43f96b186453fcb0b07e7859100b2c5c8cda7756 /booboo.txt | |
| parent | 2022-07-03T14:45:01Z (diff) | |
| download | repos-9f787997eddd96890e87c604fd192562c6d3f438.tar.gz repos-9f787997eddd96890e87c604fd192562c6d3f438.tar.bz2 repos-9f787997eddd96890e87c604fd192562c6d3f438.zip | |
2022-07-03T15:00:01Z
Diffstat (limited to 'booboo.txt')
| -rw-r--r-- | booboo.txt | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/booboo.txt b/booboo.txt index 8cc1810957c1..376c998ef54c 100644 --- a/booboo.txt +++ b/booboo.txt @@ -15,30 +15,29 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo *** syncing booboo From https://github.com/l29ah/booboo - bd47072..2efff44 master -> origin/master -Updating bd47072..2efff44 -Fast-forward - .../crazyflie-clients-python-2017.06.1.ebuild | 2 +- - .../crazyflie-clients-python/crazyflie-clients-python-2019.01.ebuild | 2 +- - dev-embedded/libmpsse/libmpsse-1.3.2.ebuild | 2 +- - dev-python/cflib/cflib-0.1.3.ebuild | 2 +- - dev-python/cflib/cflib-0.1.6.ebuild | 2 +- - dev-python/cflib/cflib-0.1.7.ebuild | 2 +- - dev-python/lfmh/lfmh-1.1.1.ebuild | 2 +- - dev-python/python-olm/python-olm-3.1.5.ebuild | 2 +- - dev-python/pythonocc/pythonocc-0.18.1.ebuild | 2 +- - dev-python/pythonocc/pythonocc-9999.ebuild | 2 +- - media-gfx/cadquery/cadquery-9999.ebuild | 5 ----- - media-gfx/cq-editor/cq-editor-9999.ebuild | 2 +- - media-sound/scrobbler/scrobbler-1.1.4.ebuild | 2 +- - net-libs/loudmouth/loudmouth-9999.ebuild | 1 + - net-misc/trackma/trackma-9999.ebuild | 2 +- - sys-apps/me_cleaner/me_cleaner-9999.ebuild | 2 +- - 16 files changed, 15 insertions(+), 19 deletions(-) + + 2efff44...3afd710 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 booboo + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync booboo +*** syncing booboo +Cloning into '/var/lib/repo-mirror-ci/sync/booboo'... *** synced booboo - * 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 booboo - * dev-perl/UI-Dialog-1.08: failed sourcing ebuild: perl-module: EAPI 5 not supported, (perl-module.eclass, line 32: called die) - * Cache regen failed with 1 + * Cache regenerated successfully |