diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-17 06:48:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-08-17 06:48:55 +0000 |
| commit | 84e6657b15a6392a4f3ce4a4cd37c4a04e3e72fc (patch) | |
| tree | 6d6ff08046541e453c9fb4106e4ef369d113a25b /icinga.txt | |
| parent | 2024-08-17T06:30:00Z (diff) | |
| download | repos-84e6657b15a6392a4f3ce4a4cd37c4a04e3e72fc.tar.gz repos-84e6657b15a6392a4f3ce4a4cd37c4a04e3e72fc.tar.bz2 repos-84e6657b15a6392a4f3ce4a4cd37c4a04e3e72fc.zip | |
2024-08-17T06:45:00Z
Diffstat (limited to 'icinga.txt')
| -rw-r--r-- | icinga.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/icinga.txt b/icinga.txt index f4651b4afd4e..cd3f275b2b4b 100644 --- a/icinga.txt +++ b/icinga.txt @@ -14,29 +14,9 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync icinga *** syncing icinga -From https://github.com/antonfischl1980/icinga - + 000d897...32706a2 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 icinga - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync icinga -*** syncing icinga -Cloning into '/var/lib/repo-mirror-ci/sync/icinga'... +Already up to date. *** synced icinga - * 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 icinga |