phackerlay

1
{'description': {'en': 'Overlay for phackers'},
2
 'feed': ['https://gitlab.phys-el.ru/gentoo/phackerlay/commits/master.atom'],
3
 'homepage': 'https://gitlab.phys-el.ru/gentoo/phackerlay',
4
 'name': 'phackerlay',
5
 'owner': [{'email': 'ustinov@phys-el.ru',
6
            'name': 'Alexander B. Ustinov',
7
            'type': 'person'}],
8
 'quality': 'experimental',
9
 'source': [{'type': 'git',
10
             'uri': 'https://gitlab.phys-el.ru/gentoo/phackerlay.git'}],
11
 'status': 'unofficial'}
12
pkgcore 0.12.24
13

            
14
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync phackerlay


            
15
*** syncing phackerlay


            
16
From https://gitlab.phys-el.ru/gentoo/phackerlay


            
17
 + ce7cd5c...0643758 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 phackerlay


            
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 phackerlay


            
35
*** syncing phackerlay


            
36
Cloning into '/var/lib/repo-mirror-ci/sync/phackerlay'...


            
37
*** synced phackerlay


            
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 phackerlay


            
42
 * Cache regenerated successfully