diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/gentoo.txt b/gentoo.txt index 04b7409f7853..646a1e320506 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -27,24 +27,22 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - 6a310103572..23a2a1e8a0e master -> origin/master -Updating 6a310103572..23a2a1e8a0e -Fast-forward - dev-lang/python/python-2.7.18_p8.ebuild | 2 +- - dev-python/pillow/pillow-8.2.0.ebuild | 2 +- - .../texlive-metapost/texlive-metapost-2021.ebuild | 2 +- - games-arcade/gav/gav-0.9.0-r1.ebuild | 9 +- - games-board/ascal/ascal-0.1.1-r1.ebuild | 12 +-- - games-board/ascal/files/ascal-0.1.1-gcc43.patch | 12 +-- - ...ee-1.9.3.ebuild => openyahtzee-1.9.3-r1.ebuild} | 2 +- - games-strategy/warzone2100/Manifest | 2 - - .../warzone2100/warzone2100-3.2.3.ebuild | 114 --------------------- - sys-devel/gcc-config/gcc-config-2.4.ebuild | 2 +- - 10 files changed, 25 insertions(+), 134 deletions(-) - rename games-board/openyahtzee/{openyahtzee-1.9.3.ebuild => openyahtzee-1.9.3-r1.ebuild} (97%) - delete mode 100644 games-strategy/warzone2100/warzone2100-3.2.3.ebuild + 23a2a1e8a0e..cab5c607434 master -> origin/master +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> + +!!! failed syncing gentoo + * Sync failed with 1 + * Will try to re-create +$ pmaint sync gentoo +*** syncing gentoo +Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'... +Updating files: 18% (15613/85716)
Updating files: 19% (16287/85716)
Updating files: 20% (17144/85716)
Updating files: 21% (18001/85716)
Updating files: 22% (18858/85716)
Updating files: 23% (19715/85716)
Updating files: 24% (20572/85716)
Updating files: 25% (21429/85716)
Updating files: 26% (22287/85716)
Updating files: 27% (23144/85716)
Updating files: 28% (24001/85716)
Updating files: 29% (24858/85716)
Updating files: 30% (25715/85716)
Updating files: 31% (26572/85716)
Updating files: 32% (27430/85716)
Updating files: 33% (28287/85716)
Updating files: 34% (29144/85716)
Updating files: 35% (30001/85716)
Updating files: 36% (30858/85716)
Updating files: 37% (31715/85716)
Updating files: 38% (32573/85716)
Updating files: 39% (33430/85716)
Updating files: 39% (34159/85716)
Updating files: 40% (34287/85716)
Updating files: 41% (35144/85716)
Updating files: 42% (36001/85716)
Updating files: 43% (36858/85716)
Updating files: 44% (37716/85716)
Updating files: 45% (38573/85716)
Updating files: 46% (39430/85716)
Updating files: 47% (40287/85716)
Updating files: 48% (41144/85716)
Updating files: 49% (42001/85716)
Updating files: 50% (42858/85716)
Updating files: 51% (43716/85716)
Updating files: 52% (44573/85716)
Updating files: 53% (45430/85716)
Updating files: 54% (46287/85716)
Updating files: 55% (47144/85716)
Updating files: 56% (48001/85716)
Updating files: 57% (48859/85716)
Updating files: 58% (49716/85716)
Updating files: 59% (50573/85716)
Updating files: 59% (50836/85716)
Updating files: 60% (51430/85716)
Updating files: 61% (52287/85716)
Updating files: 62% (53144/85716)
Updating files: 63% (54002/85716)
Updating files: 64% (54859/85716)
Updating files: 65% (55716/85716)
Updating files: 66% (56573/85716)
Updating files: 67% (57430/85716)
Updating files: 68% (58287/85716)
Updating files: 69% (59145/85716)
Updating files: 70% (60002/85716)
Updating files: 71% (60859/85716)
Updating files: 72% (61716/85716)
Updating files: 73% (62573/85716)
Updating files: 74% (63430/85716)
Updating files: 75% (64287/85716)
Updating files: 76% (65145/85716)
Updating files: 77% (66002/85716)
Updating files: 78% (66859/85716)
Updating files: 79% (67716/85716)
Updating files: 79% (68124/85716)
Updating files: 80% (68573/85716)
Updating files: 81% (69430/85716)
Updating files: 82% (70288/85716)
Updating files: 83% (71145/85716)
Updating files: 84% (72002/85716)
Updating files: 85% (72859/85716)
Updating files: 86% (73716/85716)
Updating files: 87% (74573/85716)
Updating files: 88% (75431/85716)
Updating files: 89% (76288/85716)
Updating files: 90% (77145/85716)
Updating files: 91% (78002/85716)
Updating files: 92% (78859/85716)
Updating files: 93% (79716/85716)
Updating files: 94% (80574/85716)
Updating files: 94% (80685/85716)
Updating files: 95% (81431/85716)
Updating files: 96% (82288/85716)
Updating files: 97% (83145/85716)
Updating files: 98% (84002/85716)
Updating files: 99% (84859/85716)
Updating files: 100% (85716/85716)
Updating files: 100% (85716/85716), done. *** 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 32 gentoo |