summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-07-31 03:16:30 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-07-31 03:16:30 +0000
commita97e4eaa0c5e2025e2cd283b3887c858eee087c9 (patch)
tree68ae46509698dcc2a53ab313150ad6e0fb678f12 /ruixi-overlay.txt
parent2022-07-31T03:00:01Z (diff)
downloadrepos-a97e4eaa0c5e2025e2cd283b3887c858eee087c9.tar.gz
repos-a97e4eaa0c5e2025e2cd283b3887c858eee087c9.tar.bz2
repos-a97e4eaa0c5e2025e2cd283b3887c858eee087c9.zip
2022-07-31T03:15:02Z
Diffstat (limited to 'ruixi-overlay.txt')
-rw-r--r--ruixi-overlay.txt28
1 files changed, 6 insertions, 22 deletions
diff --git a/ruixi-overlay.txt b/ruixi-overlay.txt
index 7eb5023b528c..dfb83674b702 100644
--- a/ruixi-overlay.txt
+++ b/ruixi-overlay.txt
@@ -14,29 +14,13 @@ $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ruixi-overl
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 ruixi-overlay
From https://github.com/Ruixi-rebirth/ruixi-overlay
- + 42c20c4...339a424 main -> origin/main (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 ruixi-overlay
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync ruixi-overlay
-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 ruixi-overlay
-Cloning into '/var/lib/repo-mirror-ci/sync/ruixi-overlay'...
+ 339a424..414359c main -> origin/main
+Updating 339a424..414359c
+Fast-forward
+ net-wireless/linux-wifi-hotspot/metadata.xml | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
*** synced ruixi-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 ruixi-overlay