summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-08-21 23:01:43 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-08-21 23:01:43 +0000
commit682520fd6efdb79f9302759460621a5fcacd27da (patch)
treeb011e501c8ba9babb38798f4d007b2fab176e3b2 /Case_Of.txt
parent2022-08-21T22:45:01Z (diff)
downloadrepos-682520fd6efdb79f9302759460621a5fcacd27da.tar.gz
repos-682520fd6efdb79f9302759460621a5fcacd27da.tar.bz2
repos-682520fd6efdb79f9302759460621a5fcacd27da.zip
2022-08-21T23:00:01Z
Diffstat (limited to 'Case_Of.txt')
-rw-r--r--Case_Of.txt25
1 files changed, 23 insertions, 2 deletions
diff --git a/Case_Of.txt b/Case_Of.txt
index 57a9aba4fd26..85a32f501b3f 100644
--- a/Case_Of.txt
+++ b/Case_Of.txt
@@ -15,9 +15,30 @@ pkgcore 0.12.13
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of
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 Case_Of
-Already up to date.
+From https://codeberg.org/Case_Of/gentoo-overlay
+ + 1a70c5d...6c7d157 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 Case_Of
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Case_Of
+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 Case_Of
+Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'...
*** synced Case_Of
- * 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 Case_Of