diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-11-17 10:16:42 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-11-17 10:16:42 +0000 |
| commit | 0632cf072541aba7fb9c301129e3461282b5106d (patch) | |
| tree | da6fa0a2d3af74ec0575e88bf35ca2bde029337a /bubba.txt | |
| parent | 2022-11-17T10:00:01Z (diff) | |
| download | repos-0632cf072541aba7fb9c301129e3461282b5106d.tar.gz repos-0632cf072541aba7fb9c301129e3461282b5106d.tar.bz2 repos-0632cf072541aba7fb9c301129e3461282b5106d.zip | |
2022-11-17T10:15:01Z
Diffstat (limited to 'bubba.txt')
| -rw-r--r-- | bubba.txt | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/bubba.txt b/bubba.txt index 668b45cb7226..788053167dda 100644 --- a/bubba.txt +++ b/bubba.txt @@ -16,18 +16,29 @@ $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. *** syncing bubba From https://github.com/gordonb3/bubba-overlay - ad90bce..ff3e7c9 master -> origin/master -Updating ad90bce..ff3e7c9 -Fast-forward - media-sound/logitechmediaserver/Manifest | 7 ++++--- - .../files/LMS-8.1.1_AAC_Radio_playback_fix.patch | 23 ++++++++++++++++++++++ - .../logitechmediaserver/files/gentoo-filepaths.pm | 1 + - .../logitechmediaserver-8.2.0.ebuild | 3 ++- - .../logitechmediaserver-8.3.0.ebuild | 3 ++- - 5 files changed, 32 insertions(+), 5 deletions(-) - create mode 100644 media-sound/logitechmediaserver/files/LMS-8.1.1_AAC_Radio_playback_fix.patch + + ff3e7c9...dd84d1f 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 bubba + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba +ERROR:pkgcore:Cannot write cache for /var/cache/pkgcore/plugincache: [Errno 13] Permission denied: '/var/cache/pkgcore/.update.plugincache'. Try running pplugincache. +*** syncing bubba +Cloning into '/var/lib/repo-mirror-ci/sync/bubba'... *** synced bubba - * 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 bubba |