summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-07-31 03:46:31 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-07-31 03:46:31 +0000
commit872a55e8a61cd72d9c6e0396af57d5496179772b (patch)
tree03e0fbd8f0d6072da8d57d5cf2856ef56bfc0c08 /ruixi-overlay.txt
parent2022-07-31T03:30:01Z (diff)
downloadrepos-872a55e8a61cd72d9c6e0396af57d5496179772b.tar.gz
repos-872a55e8a61cd72d9c6e0396af57d5496179772b.tar.bz2
repos-872a55e8a61cd72d9c6e0396af57d5496179772b.zip
2022-07-31T03:45:01Z
Diffstat (limited to 'ruixi-overlay.txt')
-rw-r--r--ruixi-overlay.txt23
1 files changed, 19 insertions, 4 deletions
diff --git a/ruixi-overlay.txt b/ruixi-overlay.txt
index b7793ce7189c..ec2d08a01fad 100644
--- a/ruixi-overlay.txt
+++ b/ruixi-overlay.txt
@@ -12,11 +12,24 @@ pkgcore 0.12.12
$ 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.
+WARNING:pkgcore:ruixi-overlay repo at '/var/lib/repo-mirror-ci/sync/ruixi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+WARNING:pkgcore:ruixi-overlay repo at '/var/lib/repo-mirror-ci/sync/ruixi-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing ruixi-overlay
From https://github.com/Ruixi-rebirth/ruixi-overlay
- * [new branch] master -> origin/master
-Your configuration specifies to merge with the ref 'refs/heads/main'
-from the remote, but no such ref was fetched.
+ + a9f43a7...b68ea0e 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 ruixi-overlay
* Sync failed with 1
* Will try to re-create
@@ -28,4 +41,6 @@ Cloning into '/var/lib/repo-mirror-ci/sync/ruixi-overlay'...
* Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
- * Missing profiles/repo_name, removing
+$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 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.
+ * Cache regenerated successfully