blob: 32d6d05bb8a851428f0d45b50164d89c1f9a517b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
{'description': {'en': 'Personal repository of lanodan, mostly experiments and '
'personal changes'},
'feed': ['https://hacktivis.me/git/overlay/atom.xml'],
'homepage': 'https://hacktivis.me/git/overlay',
'name': 'lanodanOverlay',
'owner': [{'email': 'contact@hacktivis.me',
'name': 'Haelwenn (lanodan) Monnier',
'type': 'person'}],
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://hacktivis.me/git/overlay.git'}],
'status': 'unofficial'}
pkgcore 0.12.24
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lanodanOverlay
*** syncing lanodanOverlay
From https://hacktivis.me/git/overlay
+ c7b1c08...17d59c9 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 lanodanOverlay
* Sync failed with 1
* Will try to re-create
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync lanodanOverlay
*** syncing lanodanOverlay
Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'...
*** synced lanodanOverlay
* 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 lanodanOverlay
* Cache regenerated successfully
|
GitWeb
