diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/gentoo.txt b/gentoo.txt index dcf860054f72..e8d93ea54713 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -26,24 +26,23 @@ or --ff-only on the command line to override the configured default per invocation. From https://anongit.gentoo.org/git/repo/gentoo - f1dfdab0885..72d8cc29f71 master -> origin/master -Updating f1dfdab0885..72d8cc29f71 -Fast-forward - dev-libs/liberasurecode/Manifest | 1 + - .../liberasurecode/liberasurecode-1.6.2.ebuild | 37 ++++ - profiles/package.mask | 7 + - sys-cluster/nova/Manifest | 2 + - sys-cluster/nova/nova-21.1.1.ebuild | 217 +++++++++++++++++++++ - sys-cluster/swift/Manifest | 1 - - sys-cluster/swift/swift-2.25.0.ebuild | 113 ----------- - sys-cluster/swift/swift-2.25.1.ebuild | 2 +- - 8 files changed, 265 insertions(+), 115 deletions(-) - create mode 100644 dev-libs/liberasurecode/liberasurecode-1.6.2.ebuild - create mode 100644 sys-cluster/nova/nova-21.1.1.ebuild - delete mode 100644 sys-cluster/swift/swift-2.25.0.ebuild + 72d8cc29f71..3b5d8d7b3e3 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> + +*** 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% (14773/87357)
Updating files: 17% (14851/87357)
Updating files: 18% (15725/87357)
Updating files: 19% (16598/87357)
Updating files: 20% (17472/87357)
Updating files: 21% (18345/87357)
Updating files: 22% (19219/87357)
Updating files: 23% (20093/87357)
Updating files: 24% (20966/87357)
Updating files: 25% (21840/87357)
Updating files: 26% (22713/87357)
Updating files: 27% (23587/87357)
Updating files: 28% (24460/87357)
Updating files: 29% (25334/87357)
Updating files: 30% (26208/87357)
Updating files: 31% (27081/87357)
Updating files: 32% (27955/87357)
Updating files: 33% (28828/87357)
Updating files: 34% (29702/87357)
Updating files: 34% (30440/87357)
Updating files: 35% (30575/87357)
Updating files: 36% (31449/87357)
Updating files: 37% (32323/87357)
Updating files: 38% (33196/87357)
Updating files: 39% (34070/87357)
Updating files: 40% (34943/87357)
Updating files: 41% (35817/87357)
Updating files: 42% (36690/87357)
Updating files: 43% (37564/87357)
Updating files: 44% (38438/87357)
Updating files: 45% (39311/87357)
Updating files: 46% (40185/87357)
Updating files: 47% (41058/87357)
Updating files: 48% (41932/87357)
Updating files: 49% (42805/87357)
Updating files: 50% (43679/87357)
Updating files: 50% (44248/87357)
Updating files: 51% (44553/87357)
Updating files: 52% (45426/87357)
Updating files: 53% (46300/87357)
Updating files: 54% (47173/87357)
Updating files: 55% (48047/87357)
Updating files: 56% (48920/87357)
Updating files: 57% (49794/87357)
Updating files: 58% (50668/87357)
Updating files: 59% (51541/87357)
Updating files: 60% (52415/87357)
Updating files: 61% (53288/87357)
Updating files: 62% (54162/87357)
Updating files: 63% (55035/87357)
Updating files: 64% (55909/87357)
Updating files: 65% (56783/87357)
Updating files: 66% (57656/87357)
Updating files: 67% (58530/87357)
Updating files: 67% (59113/87357)
Updating files: 68% (59403/87357)
Updating files: 69% (60277/87357)
Updating files: 70% (61150/87357)
Updating files: 71% (62024/87357)
Updating files: 72% (62898/87357)
Updating files: 73% (63771/87357)
Updating files: 74% (64645/87357)
Updating files: 75% (65518/87357)
Updating files: 76% (66392/87357)
Updating files: 77% (67265/87357)
Updating files: 78% (68139/87357)
Updating files: 79% (69013/87357)
Updating files: 80% (69886/87357)
Updating files: 80% (70551/87357)
Updating files: 81% (70760/87357)
Updating files: 82% (71633/87357)
Updating files: 83% (72507/87357)
Updating files: 84% (73380/87357)
Updating files: 85% (74254/87357)
Updating files: 86% (75128/87357)
Updating files: 87% (76001/87357)
Updating files: 88% (76875/87357)
Updating files: 89% (77748/87357)
Updating files: 90% (78622/87357)
Updating files: 91% (79495/87357)
Updating files: 92% (80369/87357)
Updating files: 93% (81243/87357)
Updating files: 94% (82116/87357)
Updating files: 95% (82990/87357)
Updating files: 96% (83863/87357)
Updating files: 97% (84737/87357)
Updating files: 98% (85610/87357)
Updating files: 98% (85707/87357)
Updating files: 99% (86484/87357)
Updating files: 100% (87357/87357)
Updating files: 100% (87357/87357), 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 |