diff options
Diffstat (limited to 'average.txt')
| -rw-r--r-- | average.txt | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/average.txt b/average.txt index c35b264ebd32..cb9d29fb51cf 100644 --- a/average.txt +++ b/average.txt @@ -12,26 +12,14 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/AnAverageHuman/average.git'}], 'status': 'unofficial'} -$ pmaint sync average -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: +pkgcore 0.12.24 - git config pull.rebase false # merge (the default strategy) - git config pull.rebase true # rebase - git config pull.ff only # fast-forward only - -You can replace "git config" with "git config --global" to set a default -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. - -Already up to date. +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync average *** syncing average +Already up to date. *** synced average * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD -$ pmaint regen --use-local-desc --pkg-desc-index -t 1 average - * dev-util/compiledb-0.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT. - * Cache regen failed with 1 +$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 average + * Cache regenerated successfully |