diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt index c40ef7f85722..1c4eeb6595af 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -12,23 +12,22 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/gentoo.git'}], 'status': 'official'} $ pmaint sync gentoo -From https://anongit.gentoo.org/git/repo/gentoo - fafdba428ff..18ff09608f6 master -> origin/master -Updating fafdba428ff..18ff09608f6 -Fast-forward - app-emulation/winetricks/Manifest | 1 + - .../winetricks/winetricks-20191224.ebuild | 86 ++++++++++++++++++++++ - sys-apps/ed/Manifest | 2 +- - .../ed/{ed-1.14.2.ebuild => ed-1.16_rc1.ebuild} | 18 +++-- - sys-block/di/Manifest | 2 +- - .../di/{di-4.47.1.ebuild => di-4.47.3.ebuild} | 0 - 6 files changed, 101 insertions(+), 8 deletions(-) - create mode 100644 app-emulation/winetricks/winetricks-20191224.ebuild - rename sys-apps/ed/{ed-1.14.2.ebuild => ed-1.16_rc1.ebuild} (51%) - rename sys-block/di/{di-4.47.1.ebuild => di-4.47.3.ebuild} (100%) +You are not currently on a branch. +Please specify which branch you want to merge with. +See git-pull(1) for details. + + git pull <remote> <branch> + +*** syncing gentoo +*** failed syncing gentoo + * Sync failed with 1 + * Will try to re-create +$ pmaint sync gentoo +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 16% (15299/93828)
Updating files: 17% (15951/93828)
Updating files: 18% (16890/93828)
Updating files: 19% (17828/93828)
Updating files: 20% (18766/93828)
Updating files: 21% (19704/93828)
Updating files: 22% (20643/93828)
Updating files: 23% (21581/93828)
Updating files: 24% (22519/93828)
Updating files: 25% (23457/93828)
Updating files: 26% (24396/93828)
Updating files: 27% (25334/93828)
Updating files: 28% (26272/93828)
Updating files: 29% (27211/93828)
Updating files: 30% (28149/93828)
Updating files: 31% (29087/93828)
Updating files: 32% (30025/93828)
Updating files: 33% (30964/93828)
Updating files: 33% (31121/93828)
Updating files: 34% (31902/93828)
Updating files: 35% (32840/93828)
Updating files: 36% (33779/93828)
Updating files: 37% (34717/93828)
Updating files: 38% (35655/93828)
Updating files: 39% (36593/93828)
Updating files: 40% (37532/93828)
Updating files: 41% (38470/93828)
Updating files: 42% (39408/93828)
Updating files: 43% (40347/93828)
Updating files: 44% (41285/93828)
Updating files: 45% (42223/93828)
Updating files: 46% (43161/93828)
Updating files: 47% (44100/93828)
Updating files: 48% (45038/93828)
Updating files: 49% (45976/93828)
Updating files: 50% (46914/93828)
Updating files: 50% (47157/93828)
Updating files: 51% (47853/93828)
Updating files: 52% (48791/93828)
Updating files: 53% (49729/93828)
Updating files: 54% (50668/93828)
Updating files: 55% (51606/93828)
Updating files: 56% (52544/93828)
Updating files: 57% (53482/93828)
Updating files: 58% (54421/93828)
Updating files: 59% (55359/93828)
Updating files: 60% (56297/93828)
Updating files: 61% (57236/93828)
Updating files: 62% (58174/93828)
Updating files: 63% (59112/93828)
Updating files: 64% (60050/93828)
Updating files: 65% (60989/93828)
Updating files: 66% (61927/93828)
Updating files: 66% (62499/93828)
Updating files: 67% (62865/93828)
Updating files: 68% (63804/93828)
Updating files: 69% (64742/93828)
Updating files: 70% (65680/93828)
Updating files: 71% (66618/93828)
Updating files: 72% (67557/93828)
Updating files: 73% (68495/93828)
Updating files: 74% (69433/93828)
Updating files: 75% (70371/93828)
Updating files: 76% (71310/93828)
Updating files: 77% (72248/93828)
Updating files: 77% (73117/93828)
Updating files: 78% (73186/93828)
Updating files: 79% (74125/93828)
Updating files: 80% (75063/93828)
Updating files: 81% (76001/93828)
Updating files: 82% (76939/93828)
Updating files: 83% (77878/93828)
Updating files: 84% (78816/93828)
Updating files: 85% (79754/93828)
Updating files: 86% (80693/93828)
Updating files: 87% (81631/93828)
Updating files: 88% (82569/93828)
Updating files: 89% (83507/93828)
Updating files: 90% (84446/93828)
Updating files: 91% (85384/93828)
Updating files: 92% (86322/93828)
Updating files: 93% (87261/93828)
Updating files: 94% (88199/93828)
Updating files: 95% (89137/93828)
Updating files: 95% (89508/93828)
Updating files: 96% (90075/93828)
Updating files: 97% (91014/93828)
Updating files: 98% (91952/93828)
Updating files: 99% (92890/93828)
Updating files: 100% (93828/93828)
Updating files: 100% (93828/93828), done. *** syncing gentoo *** synced gentoo - * Sync succeeded + * Sync succeeded after re-adding $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo |