summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-01-28 20:32:43 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-01-28 20:32:43 +0000
commitfeb9d77f8ffbd06e77705f1ba2e7e0f841b96f7b (patch)
tree64a0fbd5cbeedb723da0d5a3e8d29901553f7e4c /spikyatlinux.txt
parent2021-01-28T19:00:02Z (diff)
downloadrepos-feb9d77f8ffbd06e77705f1ba2e7e0f841b96f7b.tar.gz
repos-feb9d77f8ffbd06e77705f1ba2e7e0f841b96f7b.tar.bz2
repos-feb9d77f8ffbd06e77705f1ba2e7e0f841b96f7b.zip
2021-01-28T20:00:01Z
Diffstat (limited to 'spikyatlinux.txt')
-rw-r--r--spikyatlinux.txt14
1 files changed, 2 insertions, 12 deletions
diff --git a/spikyatlinux.txt b/spikyatlinux.txt
index 2e4159daae5d..4b80b61c9fb2 100644
--- a/spikyatlinux.txt
+++ b/spikyatlinux.txt
@@ -10,8 +10,6 @@
'uri': 'https://github.com/spikyatlinux/ebuilds_for_gentoo.git'}],
'status': 'unofficial'}
$ pmaint sync spikyatlinux
-WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
@@ -25,18 +23,10 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.
-From https://github.com/spikyatlinux/ebuilds_for_gentoo
- + 465ccf4...b8e14e1 master -> origin/master (forced update)
-fatal: refusing to merge unrelated histories
-*** syncing spikyatlinux
-!!! failed syncing spikyatlinux
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync spikyatlinux
-Cloning into '/var/lib/repo-mirror-ci/sync/spikyatlinux'...
+Already up to date.
*** syncing spikyatlinux
*** synced spikyatlinux
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 spikyatlinux