| 1 | {'description': {'en': 'vGist overlay, for personal use.'},
|
| 2 | 'feed': ['https://github.com/vgist/vgist-overlay/commits/master.atom'],
|
| 3 | 'homepage': 'https://github.com/vgist/vgist-overlay',
|
| 4 | 'name': 'vGist',
|
| 5 | 'owner': [{'email': 'admin@mail.havee.me', 'name': 'havee', 'type': 'person'}],
|
| 6 | 'quality': 'experimental',
|
| 7 | 'source': [{'type': 'git',
|
| 8 | 'uri': 'https://github.com/vgist/vgist-overlay.git'},
|
| 9 | {'type': 'git', 'uri': 'git@github.com:vgist/vgist-overlay.git'}],
|
| 10 | 'status': 'official'}
|
| 11 | pkgcore 0.12.11
|
| 12 |
|
| 13 | $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
|
| 14 | WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
|
| 15 | *** syncing vGist
|
| 16 | From https://github.com/vgist/vgist-overlay
|
| 17 | + 6c7f069...7607041 master -> origin/master (forced update)
|
| 18 | hint: You have divergent branches and need to specify how to reconcile them.
|
| 19 | hint: You can do so by running one of the following commands sometime before
|
| 20 | hint: your next pull:
|
| 21 | hint:
|
| 22 | hint: git config pull.rebase false # merge
|
| 23 | hint: git config pull.rebase true # rebase
|
| 24 | hint: git config pull.ff only # fast-forward only
|
| 25 | hint:
|
| 26 | hint: You can replace "git config" with "git config --global" to set a default
|
| 27 | hint: preference for all repositories. You can also pass --rebase, --no-rebase,
|
| 28 | hint: or --ff-only on the command line to override the configured default per
|
| 29 | hint: invocation.
|
| 30 | fatal: Need to specify how to reconcile divergent branches.
|
| 31 | !!! failed syncing vGist
|
| 32 | * Sync failed with 1
| [FATAL] |
| 33 | * Will try to re-create
|
| 34 | $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
|
| 35 | *** syncing vGist
|
| 36 | Cloning into '/var/lib/repo-mirror-ci/sync/vGist'...
|
| 37 | *** synced vGist
|
| 38 | * Sync succeeded after re-adding
|
| 39 | $ git log --format=%ci -1
|
| 40 | $ git show -q --pretty=format:%G? HEAD
|
| 41 | $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 vGist
|
| 42 | * Cache regenerated successfully
|