diff options
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index 57d0a7b94df3..95e93d5c5acb 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -15,24 +15,40 @@ pkgcore 0.12.1 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor *** syncing SwordArMor From https://git.grifon.fr/alarig/SwordArMor-gentoo-overlay - aaf3b40..37bb874 master -> origin/master -Updating aaf3b40..37bb874 -Fast-forward - gemini-client/lagrange/Manifest | 2 - - gemini-client/lagrange/lagrange-1.4.2.ebuild | 40 -------------------- - gemini-client/lagrange/lagrange-1.5.1.ebuild | 43 ---------------------- - gemini-client/lagrange/metadata.xml | 33 ----------------- - .../2021-06-15-moving-lagrange.en.txt | 13 +++++++ - profiles/updates/2Q-2021 | 1 + - 6 files changed, 14 insertions(+), 118 deletions(-) - delete mode 100644 gemini-client/lagrange/Manifest - delete mode 100644 gemini-client/lagrange/lagrange-1.4.2.ebuild - delete mode 100644 gemini-client/lagrange/lagrange-1.5.1.ebuild - delete mode 100644 gemini-client/lagrange/metadata.xml - create mode 100644 metadata/news/2021-06-15-moving-lagrange/2021-06-15-moving-lagrange.en.txt - create mode 100644 profiles/updates/2Q-2021 + + 37bb874...85c9fde master -> origin/master (forced update) +hint: Pulling without specifying how to reconcile divergent branches is +hint: discouraged. You can squelch this message by running one of the following +hint: commands sometime before your next pull: +hint: +hint: git config pull.rebase false # merge (the default strategy) +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. +Committer identity unknown + +*** Please tell me who you are. + +Run + + git config --global user.email "you@example.com" + git config --global user.name "Your Name" + +to set your account's default identity. +Omit --global to set the identity only in this repository. + +fatal: empty ident name (for <repomirrorci@jacamar.gentoo.org>) not allowed +!!! failed syncing SwordArMor + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync SwordArMor +*** syncing SwordArMor +Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... *** synced SwordArMor - * 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 SwordArMor |